Commit graph

136 commits

Author SHA1 Message Date
Bill Currie
4bc167c5aa evil hack, but can build from "make dist" again 2001-09-11 06:34:03 +00:00
Bill Currie
6c8a112cb8 get "make dist" working again 2001-09-04 21:00:08 +00:00
Ragnvald Maartmann-Moe IV
c6266aba36 sw32. Flee in terror. This'll break compilation for everything until -sdl32 compiles. sw32 wont work for a while either, so don't get overly excited yet. 2001-08-25 02:47:11 +00:00
Adam Olsen
1314c89b6c - add libs/gamecode/builtins subdir, with libQFgamecode_builtins.la
- add .gitignore files
- fix building :)
2001-08-21 22:34:20 +00:00
Zephaniah E. Hull
20adccc9e4 A few things, first is that I removed the (rather broken) serial
networking support.

Second, I moves keys.c from qw and nq to libs/video/targets when I did
the next thing.

Existing user configs which do binds, sledge hammer. Sledge hammer,
existing user configs which do binds. *WHACK* *WHACK* *WHACK*

See, much nicer now.

Someone should document it, and fix all targets which don't use SDL for
input. (I honestly don't expect svgalib and the like to ever be fixed.)
2001-08-16 09:19:36 +00:00
Bill Currie
59e50d933d sdl and sgl clients now build 2001-08-15 20:55:22 +00:00
Bill Currie
8d0acf7630 remove some unneeded -L.s. it seems some versions of binutils don't like it 2001-08-15 06:12:38 +00:00
Ragnvald Maartmann-Moe IV
b868a09661 Kill off gl_view.c and sw_view.c. Renderer merge is more or less complete now. Software and gl renderers now calculate color shifts the same way, and sw looks a bit different now. Powerups don't shift enough in sw right now, IMO. 2001-08-10 00:28:57 +00:00
Bill Currie
44daa25fe6 force the software clients to use the static renderer so asm is used 2001-07-26 20:55:42 +00:00
Chris Ison
85d2176bb6 make -3dfx compile again, may need fixing for mesa specific functions listed in vid_3dfxsvga.c 2001-06-29 02:10:52 +00:00
Zephaniah E. Hull
3715430479 This is changing more then I wanted to at once, however.
The major change is that we no longer require libGL to even exist on the
system at compile time for the GL targets, we dynamicly link to the
libGL of choice at run time. (This probably breaks most non-linux
systems, and all GL targets except -glx, some fixup will be needed.)
(This also kills glquake, dead dead DEAD! GONE FOREVER! WHEE!)

Some gl_draw cleanup.

Commented out equake alias model occlusion test stuff, very experimental.

Added the .lo and .la patterns to the .gitignore files.

Some minor sbar cleanup. (We don't use the disc in use symbol for
anything.)
2001-06-24 09:25:55 +00:00
Joseph Carter
d5dabdf3d8 Fix -lqfnet errors 2001-06-18 01:07:09 +00:00
Adam Olsen
4f28b39b01 depend on libqfnet.la instead of libqfnet.a 2001-06-16 22:33:56 +00:00
Bill Currie
8c13809e9c don't process .S files when not using asm (either --disable-asmopt or non-x86
platforms). Done by moving the asm objects into libasm.la (yes, there's one in
each dir that needs it) so that the Makefiles don't explode.
2001-06-14 19:52:38 +00:00
Bill Currie
b9f35283f4 make dist fixes + a --disable-asmopt fix for mingw 2001-06-08 02:47:30 +00:00
Bill Currie
735a35b2f9 compile fixes from Artur Frysiak <wiget@pld.org.pl> 2001-06-05 17:23:03 +00:00
Ragnvald Maartmann-Moe IV
85333a9f96 Convert cd audio libs to plugins. Windows untested, dos and sgi not converted yet. 2001-06-01 22:55:33 +00:00
Bill Currie
940598f240 merge pcx.c, tga.c and wad.c. util seemed the most logical place, but LoadPCX
had to be modified to get away from vid.h (better designe now IMO anyway)
2001-05-30 20:56:53 +00:00
Adam Olsen
8ca626dacc add -export-dynamic to linker lines, so you can use sound plugins with static builds. 2001-05-30 18:35:19 +00:00
Bill Currie
18fd21da77 merge the particle system 2001-05-29 19:58:35 +00:00
Bill Currie
4c5b977902 move cl_math.S into renderer/sw/transform.S (never before realised it was
part of the renderer)
2001-05-26 03:33:09 +00:00
Bill Currie
1038f88a64 disable asm in the software renderer for now. This will allow me to fix the
files one at a time and allow others to use software independent of asm usage
(even if a little slowly (~14% slower on my dual c450)).
2001-05-25 14:57:31 +00:00
Bill Currie
73e6e1684f FINALLY, the nq and qw renderers are merged. the view and particle subsystems
are not yet merged due to their dependence on the client, but that will come
soon.
2001-05-24 19:22:35 +00:00
Bill Currie
1a25bc9349 gl_screen.c and screen.c are now client clean (and merged :) 2001-05-23 06:33:23 +00:00
Bill Currie
4a80639556 sw and gl rmisc are now client clean. the graphing functions ahve been pulled
out into r_graph.c (Time and Z graph), cl_ngraph.c (Net graph), and
{gl,sw}_graph.c (R_LineGraph). gl_ngraph.c is gone. Unfortunatly, something
is rather wrong with NetGraph in gl (probably R_LineGraph).
2001-05-22 06:00:38 +00:00
Ragnvald Maartmann-Moe IV
1aef81e9ef Minor makefile cleanups. 2001-05-20 23:30:16 +00:00
Ragnvald Maartmann-Moe IV
ee8bdb0742 sw_rvars.c was just a little bit silly for a simple variable declaration. 2001-05-20 21:44:05 +00:00
Bill Currie
daca64ed04 more cl*.h dependency cleanups realtime and cl.time are no longer reffed 2001-05-20 03:54:55 +00:00
Bill Currie
d1c2b0ec52 r_efrag.c no longer relies on cl*.h 2001-05-20 02:39:56 +00:00
Adam Olsen
9cc30959e4 Sound now uses runtime plugins. Much thanks to Deek for doing all the
thinking :)
set fs_pluginpath to point to the right dir, and set snd_plugin to pick a sound
plugin.

Current issues:
- alsa 0.5 won't build properly, dunno why
- segfault on exit.  I think I know the cause of this, and how to fix it
- alsa 0.9, gus, sgi, sun, and win32 havn't been tested
2001-05-19 00:05:35 +00:00
Bill Currie
1c87b2ef94 more merging 2001-05-18 21:06:45 +00:00
Bill Currie
eb95bcae84 move the gib language out of nq and into its own dir (hehe, libQFgib:) 2001-05-17 21:45:56 +00:00
Bill Currie
d820a6ecee fix up the libs dependencies so the targets get relinked if any of the QF
libs get updated (vital for static builds)
2001-05-17 16:52:47 +00:00
Bill Currie
a344c9fbd2 lib link order fixing so stat libs work 2001-05-17 08:29:04 +00:00
Bill Currie
72cc67e863 kill r_fullbright and r_draworder
`merge' skin handling
2001-05-16 06:01:34 +00:00
Bill Currie
afef935399 95% merge gl_rmain.c
nq is actually generally working again, except alias models are black
2001-05-14 06:47:38 +00:00
Ragnvald Maartmann-Moe IV
220f8a6e38 Renderer merge continues. gl_rlight, gl_rmisc, gl_rmain, and gl_rsurf the current victims. 2001-05-13 00:28:50 +00:00
Ragnvald Maartmann-Moe IV
f8c15a1ed3 *poke* 2001-05-11 19:30:26 +00:00
Bill Currie
4ff86056db pull all rendering cvar declarations and initialisations out of the misc
files and put them into r_cvar.[ch] getting ready for the renderer merge
2001-05-11 19:21:48 +00:00
Bill Currie
8ce3fa5e8f `merge' gl_refrag.c and sw_refrag.c into r_efrag.c like what was done in qw 2001-05-11 06:09:01 +00:00
Bill Currie
44317f299e merge gl_mesh.c into libQFmodels 2001-05-11 05:59:17 +00:00
Ragnvald Maartmann-Moe IV
28c809d27e Alliteration Annoys Always 2001-05-11 01:01:27 +00:00
Bill Currie
d03e28a034 correct the link order of the libs 2001-05-10 16:29:11 +00:00
Bill Currie
2c07108c65 model loading code merge. dragged in smoe merges and cleanups of d_iface.h,
r_local.h, r_shared.h, client.h and render.h at the same time (couldn't get
away from that:/) verly likely to be lots of breakage (eg, player and eye
models are NOT checksummed atm), but everything builds
2001-05-10 06:01:11 +00:00
Bill Currie
a5b2b78013 missed a removal of fnmatch.c 2001-05-09 22:07:35 +00:00
Ragnvald Maartmann-Moe IV
f6374b48ce First pass at updating nq particles. Compiles. Crashes. Taniwha wanted a look. Flee in terror.
Also has bunches of cleanups, including string.h/strings.h ifdefs, whitespace, and removal of pointless comments.
2001-05-09 05:41:34 +00:00
Bill Currie
b5df1c816a move fnmatch.c and dirent.c to libQFutil 2001-05-08 20:53:25 +00:00
Ragnvald Maartmann-Moe IV
b5d3508022 Small cleanups. 2001-04-20 19:39:38 +00:00
Bill Currie
06acd3db1c massivly speed up qw/source/Makefile creation, and Makefile.in, too. ASM_ARCH
and PACKETLOG are gone from Makefile.am as the first was really redundant
and the latter now is.
2001-04-18 21:02:02 +00:00
Bill Currie
527471a7de *-wgl finally links (who knows if it works?:) and some more conceptual
cleanup
2001-04-17 15:55:33 +00:00
Adam Olsen
311cbdbe59 Fix so building statically (--disable-shared) works. 2001-04-16 17:45:35 +00:00
Ragnvald Maartmann-Moe IV
20e0961ed2 *whack* Die Mole Die!!! 2001-04-15 06:18:06 +00:00
Ragnvald Maartmann-Moe IV
778f0c129c Finish move of vid.c to libs, kill a few stragglers. 2001-04-15 05:36:56 +00:00
Ragnvald Maartmann-Moe IV
554308e51d Makefile updates. 2001-04-15 05:17:09 +00:00
Bill Currie
a3215e4dd0 at long last, nq-wgl builds. probably as broken as hell, though 2001-04-11 21:55:27 +00:00
Bill Currie
6a6d75b824 gah, more libqfsys. also fix up nq-wgl build info 2001-04-11 21:24:50 +00:00
Bill Currie
99fd4ab464 libs/video/targets/Makefile.am:
out-of-tree compile fixes
nq/source/Makefile.am:
	missed the -lqfsys
2001-04-11 16:47:08 +00:00
Bill Currie
ebb7b6310a view.h:
it seems somebody forgot to commit this. just compied direct from qw
libs/video/targets/.gitignore:
	better ignore rules
nq/source/Makefile.am:
	libqfsys.a is dead :)
the rest:
	gamma compile fixes
2001-04-11 16:19:08 +00:00
Ragnvald Maartmann-Moe IV
f789b61c56 Merged joystick code. Great deal of cleanup in input, reduced bizarre overuse of protocol.h...
Maimed joy_win.c, very likely to get odd behavior there, even if it compiles.
2001-04-11 07:57:08 +00:00
Bill Currie
47d89d73c2 nq-wgl tries to build, but ld segs :( 2001-04-11 05:23:12 +00:00
Bill Currie
9cd83e178f various fixes for out-of-srcdir building
configure.in:
	foo/Makefile MUST come before foo/bar/Makefile or foo/bar will NOT be
	created.
libs/*...*/Mkaefile.am: add INCLUDES so $(top_scrdir)/include gets searched
{qw,nq}/source/Makefile.am: fix fbset compiling (and cleaning for nq)
2001-04-11 03:09:24 +00:00
Adam Olsen
69022c7ffb Move sound targets into a library. Still doesn't pick one at runtime though. 2001-04-10 09:40:09 +00:00
Ragnvald Maartmann-Moe IV
d7eb585502 Merge cd. Doesn't dlopen different cd drivers or anything exciting... Yet. 2001-04-09 21:15:09 +00:00
Bill Currie
e0c11b2f87 grr, it was r_part.c, not r_efrag, but that's sorted properly now 2001-04-04 21:53:09 +00:00
Bill Currie
eba467689a do the rename thing again (need to fix r_efrag and r_view, grr) 2001-04-04 21:47:21 +00:00
Bill Currie
7cb6245efa link libQFutil.so against libz so the clients (and tools) don't need to worry
about it
2001-03-31 03:51:25 +00:00
Bill Currie
4f2e22bfb8 merge and move quakefs.c into libQFutil where it belongs. at long last 2001-03-30 00:44:35 +00:00
Bill Currie
80ee9eb8d1 merge and move quakeio.c into libQFutil 2001-03-29 21:16:16 +00:00
Bill Currie
dd3d2a073d make -fbdev build again AND make nq-fbdev a new target.
moved fbset.h from qw/include to include so it can be shared by nq. it's in
include instead of include/QF because I don't see any need to isntall it.
2001-03-29 17:31:15 +00:00
Jeff Teunissen
277c17cfd8 Shared library support. The util and gamecode libraries are now shared,
and this clears the way for an external API for utilities and
such. And yes, this means libtool is now used.
2001-03-29 09:07:44 +00:00
Bill Currie
09b58f7e5f merge math code into utils 2001-03-05 02:06:05 +00:00
Joseph Carter
3ab3941c81 NQ's menu is gone too, menu.c is laying around till I add more info to the
TODO file, then it dies too.
2001-03-04 07:43:27 +00:00
Bill Currie
6d6c34320f nq compiles with the new progs setup, but doesn't have a hope of running yet.
None of the globals etc structs are filled in and there will be a lot of type
errors in SVFIELD usage.
2001-03-03 08:31:58 +00:00
Bill Currie
2367b0dc5f initial work at bringing nq's progs code up-to-snuff with qw's. Doesn't work
yet :( nq segs due to either mangled strings or mangled functions, not sure
yet.
2001-02-26 20:52:14 +00:00
Bill Currie
df916ef2c7 fix up the support for -<game> 2001-02-24 06:38:01 +00:00
Bill Currie
2bfeed6820 looks like utils is more or less complete for now, except for some fixes in
nq for abyss etc (ie, the magical -<mod> args).
The interface to the message subsystem got a revamp and all the mods to the .c
files reflect this. currently a little ugly, but I plan on abstracting msg
further to clean it up and make it more oo.
2001-02-23 23:16:13 +00:00
Bill Currie
981d067000 merge qw's net_com.c and checksum.c (net_com.c was identitcle to nq's
checksum.c) and then move the resutlting checksum.c into libs/utils
ditching nq's. Due to net_com.c, qw's libqfnet.a will need to be deleted or
you will get duplicate symbol link errors. Also merge crc.[ch] and move
qfplits.[ch] to their final homes. Also, remove a slightly overzealous use
of "static" in qfplist.[ch].
2001-02-23 18:31:48 +00:00
Bill Currie
7227f77fb6 as alsa 0.6 never came out, ditch it and add 0.9 support (thanks, Abramo) 2001-02-22 20:51:51 +00:00
Bill Currie
42e52a7093 %s/libutil.a/libqfutil.a/g due to name space clash found when linking SDL.
New naming convention, all libs will be libqf<subsys>.a (should we instead
use libQF<subsys>.a?). The .so libs, when we get to them, will have to be
sorted out then.
2001-02-22 16:53:15 +00:00
Bill Currie
7516666084 libutil.a is now used by both qw and nq 2001-02-22 08:12:13 +00:00
Joseph Carter
4537b2daaa GGI has been eradicated. It's broken and none of us use it, therefore
nobody's fixing it.  Given that without DGA it's not really much faster
than X11 anyway and the lack of a maintainer, it's deadwood.
2001-02-22 00:24:45 +00:00
Bill Currie
c9ab2f1e10 forgot about all the automake macros 2001-02-21 22:26:47 +00:00
Bill Currie
8fc799f81c we finally have a bin naming scheme acceptable by all :)
nq-*
nq-server
qw-client-*
qw-server
2001-02-21 22:22:32 +00:00
Zephaniah E. Hull
a7b59259c1 New name scheme for generated bins.
cougar-(qw|nq)-cl-*
cougar-(qw|nq)-sv

If someone really wants to a S&R on cougar in configure.in and the two
Makefile.am files will change it to something else.
2001-02-20 13:46:04 +00:00
Zephaniah E. Hull
75618f96c9 Working on one common configure which lets nq and qw compile.
There, needs a little clean up though.
2001-02-20 03:10:06 +00:00
Bill Currie
87854e1a0c initial checkin of most recent newtree and nuq(?) source 2001-02-19 21:15:25 +00:00