Commit graph

8553 commits

Author SHA1 Message Date
Bill Currie
447ff2f2f5 Clean up global symbols for the gl renderer.
Where possible, symbols have been made static, prefixed with gl_/GL_ or
moved into the code shared by all renderers. This will make doing plugins
easier but done now for link testing.
2012-02-18 11:48:52 +09:00
Bill Currie
057da55385 Fix the incorrect linkage of libQFrenderer*
They're now currently not installed, but they were still building as shared
libs, and thus the installed bins were broken.
2012-02-18 11:46:46 +09:00
Antti Harri
02a624c63a Fix curl; use LIBCURL_CFLAGS, not LIBCURL_CPPFLAGS. 2012-02-17 18:10:15 +02:00
Bill Currie
78789a6833 Add support for blender's environment maps.
QF will now load a single image with (${skyname}_map.*) using blender's
layout. That is, 3x2 with the top row being back, right, front and the
bottom row being bottom, top, left.
2012-02-16 20:47:38 +09:00
Bill Currie
bfdb2b20d5 Clearify skybox layout.
Turns out quake skynames have left and right backwards.
2012-02-16 20:42:49 +09:00
Bill Currie
4cbe78babb Correct the calculation of the static plugin names.
Static plugins not working due to incorrect registered names wasn't nice :P
2012-02-16 17:06:45 +09:00
Bill Currie
ce6ab908a5 Don't include the specific plugin headers in plugin.h.
This lets files that use plugins not depend on plugins they don't use.
2012-02-13 22:02:07 +09:00
Bill Currie
699ab70482 Fix audio again.
Bah, even though audio no longer needs models, it was still linking with
it :P
2012-02-13 16:44:30 +09:00
Bill Currie
2ab1367245 Update to reflect the new dependency status. 2012-02-13 16:25:22 +09:00
Bill Currie
b69d527507 Nuke another AM_CONDITIONAL 2012-02-13 16:08:03 +09:00
Bill Currie
df47dd31f1 Clean up the excessive makefile vars generated by AC_SUBST.
While it further breaks RPM building, all AC_SUBST(HAVE_*) have been nuked.
When AM_SUBST_NOTMAKE, tell automake to not generate var = @var@ in
Makefile.in for qf specific vars (QF_SUBST is a wrapper for AC_SUBST that
also calls AM_SUBST_NOTMAKE).
2012-02-13 15:49:55 +09:00
Bill Currie
3cb4cb59b5 Link QFgamecode directly into QFruamoko.
First step in the library "merge down".

QFgamecode is now a convenience library. The only things that mention it
directly now are ruamoko and qfcc.
2012-02-13 15:05:31 +09:00
Bill Currie
9a91aff93c Move the ambient level check out of the sound renderer.
Instead, the client gets the current leaf and passes ambient_sound_level
from the leaf to S_Update.
2012-02-13 13:44:29 +09:00
Bill Currie
f389715730 Fix non-static console plugins.
Bah, fiddly stuff.
2012-02-13 10:58:42 +09:00
Bill Currie
d8a37bc791 Correct the usage of gzFile.
Thanks to spirit for pointing that QF wasn't compiling with zlib 1.2.6
(archlinux, not yet in debian).

I was using gzFile as "gzFile *gzfile", but gzFile is already a pointer. In
older versions of zlib (including the 1.2.3 that's in debian), gzFile is
declared as a void *, and it seems that gcc is happy with assigning void **
to void *. However, in recent zlib, gzFile is now struct gzFile_s *, which
gcc is most definitely unhappy about assigning to struct gzFile **.

I just hope that either I had misread the type back when I wrote quakeio,
or that nobody is using such an ancient zlib.
2012-02-13 09:00:31 +09:00
Bill Currie
dd6ff1fde2 Fix default plugin selection for static plugins too.
Ugh, I made a lot of mistakes last night.
2012-02-13 08:59:40 +09:00
Bill Currie
7642b6f812 And fix the fix.
*sigh* inadequate testing.
2012-02-12 21:40:12 +09:00
Bill Currie
a16daac352 Fix the broken defaults for sound and cd plugins.
This has the side effect of defining defaults for all plugins, but as only
sound and cd actually use the defaults, no harm done.
2012-02-12 21:16:28 +09:00
Bill Currie
e416c3e172 Clear up some annying whitespace issues.
Now that I know more about how autoconf actually works (ie, m4 stuff), I'm
finally able to fix the inability to format lists the way I want.
2012-02-12 20:14:26 +09:00
Bill Currie
546a7e7aac Avoid recusing into tools and ruamoko when not needed. 2012-02-12 19:29:31 +09:00
Bill Currie
2a472a2c44 Add the second half of the fix.
Ugh, I thought I'd added that. *sigh*
2012-02-12 18:48:47 +09:00
Bill Currie
6f2fec8afe Fix non-static plugins. 2012-02-12 18:35:00 +09:00
Bill Currie
02d24189ef Use QF_NEED for plugins.
At the moment, the selection of the default sound driver etc is broken.
2012-02-12 11:37:25 +09:00
Bill Currie
e513e29905 Move the prefix setup out of QF_PROCESS_NEED_subroutine.
And fix the macro's spelling, too :)

QF_PROCESS_NEED_subroutine needs too much knowledge to get the prefix
riight every time. Much easier to set it at invocation.
2012-02-10 18:16:32 +09:00
Bill Currie
4707706f5d Use QF_NEED for the renderer and model libraries.
This breaks RPM building, but I can fix that later.
2012-02-10 13:29:45 +09:00
Bill Currie
120f93e714 Fix a couple of missed edits from the previous commit. 2012-02-10 07:32:21 +09:00
Bill Currie
eefa89e72e Remove the AM_CONDITIONALs from tools.
Now that the tools directories aren't entered when those tools aren't being
built, there's no reason to use AM_CONDITIONAL in there.
2012-02-10 02:50:42 +09:00
Bill Currie
4d6ed605a9 Create and use QF_PROCESS_NEED_DIRS.
Not that I imagine many people use --with[out]-tools, but now unwanted
tools don't get visited by make.
2012-02-10 01:49:45 +09:00
Bill Currie
717d5368de Rework QF_PROCESS_NEED to be more general.
QF_PROCESS_NEED has been renamed to QF_PROCESS_NEED_LIBS and its guts have
been moved to QF_PROCESS_NEED_subroutine, with additional modifications to
allow QF_NEED to be used for other targets as well (eg, directories,
executables, etc).
2012-02-10 01:30:41 +09:00
Bill Currie
9281ad8521 Fix the missing desktop files.
I'm not sure what EXTRA_DATA is for, but it doesn't get files into the
distribution.
2012-02-09 16:14:56 +09:00
Bill Currie
a2d1e0667c Recurse into non-build subdirectories only when needed.
No point in sending make into directories where it will never do anything
under normal circumstances.
2012-02-09 14:12:13 +09:00
Bill Currie
39b07dc9a1 Fix the missing vc project files.
How... embarrassing. And all due to one little backslash.
2012-02-09 14:10:27 +09:00
Bill Currie
7a8f91edda Move bi_gib.c from ruamoko to gib.
This makes gib depend on gamecode, but removes the dependency on gib from
ruamoko. Unfortunately, carne now needs to be linked against gamecode even
though it never uses it.
2012-02-09 10:00:54 +09:00
Bill Currie
da4fb6178c Correct the client console plugin's dependencies. 2012-02-09 09:51:50 +09:00
Bill Currie
b716a70fa6 Fix some typos.
Too late for the release, but it makes me feel better.
2012-02-08 23:04:13 +09:00
Bill Currie
e34f0178b6 Build GLSL clients for SDL.
Just about to do a release, and I realized windows users wouldn't have any
way of checking out the new renderer. I'll add wglsl when I get a chance to
do some testing.
2012-02-08 22:05:58 +09:00
Bill Currie
cc443c42e6 Update the cross-tools locations. 2012-02-08 21:10:43 +09:00
Bill Currie
120f26cdac Update for 0.6.2 2012-02-08 20:56:43 +09:00
Bill Currie
b6fd1ea836 Start updating NEWS. 2012-02-08 20:30:13 +09:00
Bill Currie
fe3f0fa7ce Remove snax' object module.
We don't use it for anything. If we ever want it again, we can just pull
it from history.
2012-02-08 15:21:57 +09:00
Bill Currie
5c062acc80 Enable the glslx qw client.
The only reason it wa getting built is other qw clients were requiring the
same libs.
2012-02-08 08:25:50 +09:00
Bill Currie
8e5c7db857 Clean up the sound plugin configuration code.
16 if statements down to one in a for loop :)
2012-02-07 23:03:47 +09:00
Bill Currie
54626b3355 Clean out some cruft.
gibscript seems to be one of snax' little experiments. I suspect he never
committed it, but his autoconf changes snuck in by accident.
2012-02-07 23:01:43 +09:00
Sander van Dijk
cd05fecfac config.d/networking.m4: fix minor typo. 2012-02-07 20:20:26 +09:00
Sander van Dijk
8a5b16d6ab config.d/networking.m4: fix check for libcurl. 2012-02-07 20:20:19 +09:00
Bill Currie
b59ffd4cf1 Fix win32 (mingw) builds. 2012-02-07 20:18:23 +09:00
Bill Currie
0a277376ed Fix static builds. 2012-02-07 20:17:32 +09:00
Bill Currie
8ecf74753c Refer to local libs without a path.
I'm sure I've been here before... Anyway, using $(top_builddir)/... to
refer to a local lib confuses make and breaks parallel builds.
2012-02-07 18:45:55 +09:00
Bill Currie
9fbff2f4d5 Do an audit of the Makefile.am files.
o All instances of LIBADD/LDADD have a corresponding DEPENDENCIES
    specificatiion.
  o libraries now use a lib_ldflags macro to keep things consistent
  o duplication of source/lib names has been minimized (particularly in
    the libraries; more work needs to be done for the executables)
  o automake spec blocks have been organized (again, more work needs to be
    done for the executables)
2012-02-07 16:04:19 +09:00
Bill Currie
b7e5ad6306 Clean up plugin_ldadd and plugin_ldflags 2012-02-07 12:52:12 +09:00