Commit graph

116 commits

Author SHA1 Message Date
Ragnvald Maartmann-Moe IV
38a114fdb3 More merge madness. 2001-04-15 04:54:44 +00:00
Ragnvald Maartmann-Moe IV
84461e1f1f More merging. 2001-04-15 04:45:07 +00:00
Bill Currie
6a696881b3 these are now in libs/video/targets 2001-04-15 04:40:09 +00:00
Ragnvald Maartmann-Moe IV
66fafd3e0e First stage of video and input system merge. The city has collapsed, wreckage sifting ensues... 2001-04-15 04:18:22 +00:00
Bill Currie
bd0fab4ce1 vid_wgl in qw now uses vid_common_gl. probably doesn't work
compile fix for merged glquake.h in vid_wg.c in nq
2001-04-15 03:17:03 +00:00
Bill Currie
5859b3dd1f merge glquake.h. Rather messily done, but it works and all clashes were
sorted out on the nq side assuming that qw did it right (which it does:)
2001-04-14 21:22:08 +00:00
Chris Ison
1b40eb715a fixed m_filter CVAR type, started on gamma for 3dfx 2001-04-13 04:25:06 +00:00
Bill Currie
6b3b94bafc sound crashing bug fixes
snd_dma.c, {nq,qw}/source/cl_parse.c:
	change the type of snd_worldmodel from * to ** and init snd_worldmodel
	with the ADDRESS of cl.worldmodel so its changes get seen by snd_dma
snd_mixa.S:
	picize
2001-04-12 06:53:07 +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
734461092f fix redef of APIENTRY 2001-04-11 21:02:56 +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
Joseph Carter
75aa40276f A few more. Also removed a couple inaccurate comments. 2001-04-11 00:10:19 +00:00
Joseph Carter
2bc55b7828 Cvar cleanups.. NULL is now used in place of 0 for callbacks, this should
make Cvar_Get's a lot easier to read.
2001-04-10 23:39:30 +00:00
Bill Currie
051f3ca96e nq-{sdl,sgl,wgl} compile, but don't link 2001-04-10 23:17:47 +00:00
Bill Currie
8e2d89c4c2 fix up a mis-understanding about api headers
*taniwha larts himself for not explaining things to Despair
2001-04-10 21:45:42 +00:00
Ragnvald Maartmann-Moe IV
cbb4af711c Remove duplicate sound.h, move some things down from include/QF to include.
Prepare for joystick merge...
2001-04-10 20:15:18 +00:00
Bill Currie
334b528a40 forgot some bits 2001-04-10 20:11:50 +00:00
Adam Olsen
dcd924c355 Removed old files 2001-04-10 09:44:36 +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
Bill Currie
a96536c896 nuke commdef.h and clean up the results by putting its contents where they
belong.
also, merge model.h and friends (MINUS render.h). this needed moving efrags_t
from render.h to model.h.
2001-04-10 06:55:28 +00:00
Bill Currie
e236ac4bb2 move mplane_t to qtypes.h so non-asm builds will build (so long as you're not
trying to build -svga)
2001-04-10 02:36:44 +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
Joseph Carter
9ea0605558 reverting this for Mercury 2001-04-06 02:12:19 +00:00
Joseph Carter
c9ecc7a9d2 The lighthalf qboolean is no more - replaced with a gl_lightmode callback
to do the job much more simply.  Also replaced lighthalf_v with white_v on
the QW side.
2001-04-05 17:28:28 +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
e939ccc40a cvars now sport a callback function that gets called whenever the cvar changes
or on initial get.
2001-03-31 01:02:52 +00:00
Bill Currie
ad9142ff3c move Con_Printf, Con_DPrintf and Con_Print (weak) into libs/util/console.c.
Except for the cmd and cvar callbacks, libQFutil.so is now standalone.
2001-03-31 00:08:21 +00:00
Bill Currie
1e2e2f44c3 move the developer cvar into cvar.c 2001-03-30 23:35:48 +00:00
Bill Currie
99535102d7 bare bones sys stuff moved into libQFutil. unix stuff seems to work just fine,
but win32 is probably borked atm
2001-03-30 23:24:57 +00:00
Bill Currie
9145d45937 totally redundant 2001-03-30 05:03:52 +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
b432d0ea17 pull the game specific stuff out of quakefs.c in preparation for merging it 2001-03-30 00:30:38 +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
cb5c262ffc qtypes.h:
remove includes of qdefs.h and compat.h
pr_comp.h:
	merge pr_comp.h from quake and qfcc, removing the copy in qfcc
cmdlib.[ch]:
	nuke the endian code.
qendian.c:
	initialise the LittleLong etc pointers at compile time rather than run
	time
com.c (both nq and qw):
	nuke the LittleLong etc init code
everything else:
	fix up after the qtypes.h cleanup
2001-03-28 17:17:56 +00:00
Bill Currie
5a48f987a5 scripted fixups for the QF include move 2001-03-27 23:36:02 +00:00
Chris Ison
b6f6f959b9 fixed vid_3dfxsvga.c includes to match current tree 2001-03-27 23:29:31 +00:00
Adam Olsen
26d5b1ac67 Forgot these. 2001-03-27 22:42:23 +00:00
Bill Currie
067db089a2 make edict pruning, field parsing and the builtins part of progs_t like they
should have been
2001-03-27 22:39:21 +00:00
Adam Olsen
31295c1f63 Bring qw and nq snd_*.c files into sync. Should be able to move them
into a common dir now.
Also fix some #include path changes.
2001-03-27 22:30:25 +00:00
Bill Currie
82b533e1ef forgot that .S files don't have dependency info :/ 2001-03-27 21:46:49 +00:00
Bill Currie
f78b973978 move the api headers into include/QF and clean up (most of) the resulting mess.
target specific files that I don't build won't compile yet. just put QF/
infront of the offending headers.

Also move ver_check into libqfutils
2001-03-27 20:33:07 +00:00