Commit graph

266 commits

Author SHA1 Message Date
Bill Currie
4ef52da08a when linking, libs should go in *_LDADD rather than *_LDFLAGS as LDADD gets
added /after/ the object files, but LDFLAGS /before/ the object files
2002-04-08 05:42:08 +00:00
Bill Currie
c17021f01b set AS and ASFLAGS 2002-04-08 05:09:37 +00:00
Bill Currie
47643dcfbe fix a comment portability warning 2002-04-08 05:09:20 +00:00
Jamie Wilkinson
467393f8dc Trying to get the refreshers to link properly 2002-04-08 04:57:31 +00:00
Jamie Wilkinson
167eba82c0 * Now builds all video refreshers (except ref_fxgl.so
because I don't have GL/fxmesa.h)  Time to learn how
  configure can selectively build refreshers.
2002-04-07 01:07:20 +00:00
Jamie Wilkinson
9b44da971f * Added the turd directories to .gitignore
* bootstrap clean removes config.log now
2002-04-06 06:56:44 +00:00
Jamie Wilkinson
b3a333df91 * Added .deps to the .gitignore files 2002-04-06 06:33:27 +00:00
Jamie Wilkinson
4bd5535532 * Moved everything in game/ to src/ so that hopefully quake2
will run out of the source tree.
* Added the LICENSE files from xatrix and rogue, someone can
  look at them and decide if we can put the rest of them
  into CVS.
* Moved 2do.txt from ctf into docs/TODO-ctf.txt
2002-04-06 06:30:19 +00:00
Jamie Wilkinson
2e21941abd * no longer link every fucking binary against libdl, libm,
libpthread.
2002-04-06 05:56:23 +00:00
Jamie Wilkinson
0bd2f30658 * Got rid of -Dstricmp=strcasecmp 2002-04-06 05:31:01 +00:00
Jamie Wilkinson
1688fc5eee * oops, forgot these
* by the way, the asm software refresh code isn't built,
  configure will have to work out if $(AS) is available and
  we're on i386
2002-04-06 05:06:19 +00:00
Jamie Wilkinson
bd99d9b499 * Moved ref_soft into src/, made it build.
* Lots of LD and CFLAGS in src/Makefile.am... I think most
  of it should be automagic by configure
2002-04-06 05:03:53 +00:00
Jamie Wilkinson
1c775689ab * Got rid of that ugly -DLINUX_VERSION from the makefile,
instead source files now use config.h
2002-04-05 01:02:17 +00:00
Jamie Wilkinson
ff75ee0460 * Fixed include paths in ref_gl
* doesn't try to build xatrix and rogue by default
2002-04-05 00:45:27 +00:00
Jamie Wilkinson
cc662a1477 Removing this ref_soft dir (dunno why i added it) 2002-04-05 00:27:18 +00:00
Jamie Wilkinson
28147f7e1a * Moved ref_gl into src/ so that when it builds, the video
refreshers are in the same directory as the quake2 binary
2002-04-05 00:24:29 +00:00
Bill Currie
62093fabca fix a syntax error 2002-04-04 23:11:31 +00:00
Jamie Wilkinson
8e79055eef * run "boostrap clean" to *really* clean up the source tree,
should be as good as doing a pristine checkout
* I've got the xatrix and rogue modpacks building, but their
  license is dubious.  game.h has been updated with the 2
  extra lines that the xatrix and rogue game.h's had, and
  the Makefile.ams will build the code if you unpack them
  into the dirs (with a little modification because of -Wall
  -Werror ;-)
2002-04-04 13:44:56 +00:00
Jamie Wilkinson
a1d6631267 Some notes about building from CVS and a warning that things
won't work :)
2002-04-03 03:35:06 +00:00
Jamie Wilkinson
c85e0a0450 * Removed old turd makefile from game/ctf
* Removed ctf/game.h as it's in the dir above it
* merged difference of ctf/game.h into game.h (they were all
  comments)
2002-04-03 03:28:15 +00:00
Jamie Wilkinson
89ea530ad9 * Added .gitignore files for the new directories 2002-04-03 03:10:33 +00:00
Jamie Wilkinson
84d1c018f2 * configure creates the rogue and xatrix makefiles
* game.h comments and ifdef wrapper cleaned up
2002-04-03 03:07:00 +00:00
Jamie Wilkinson
8e8ec4fe76 * Added (unused) Makefile.ams for xatrix and rogue from the
top level Makefile.old
2002-04-03 02:59:33 +00:00
Jamie Wilkinson
c333a4adc7 * Now builds both baseq2 and ctf game.so 2002-04-03 02:45:20 +00:00
Jamie Wilkinson
c8157a5155 * Forgot to remove these files from the repository 2002-04-03 02:10:27 +00:00
Jamie Wilkinson
f10de7dd58 * Moved game/baseq2/game.h into game/game.h as it is the
api that the quake2 binary uses
2002-04-03 02:05:47 +00:00
Jamie Wilkinson
12ef666897 * Removed src/Makefile from the repository
* Added game/baseq2/.gitignore
2002-04-03 01:43:07 +00:00
Jamie Wilkinson
12689a70b9 * Moved ctf/docs to docs/ctf
* Moved ctf/ to game/ctf
2002-04-03 01:32:35 +00:00
Jamie Wilkinson
bf5ad75554 * Created directories for each of baseq2, ctf, xatrix, and
rogue modpacks.
* Moved game/ into game/baseq2
2002-04-03 01:21:11 +00:00
Jamie Wilkinson
300c1899d2 * Added some more ignores to .gitignore 2002-04-03 00:55:29 +00:00
Jamie Wilkinson
520789f9d3 * Enabled build of game/game.so
* Removed files in client/ qcommon/ and server/
2002-04-03 00:52:42 +00:00
Jamie Wilkinson
0efe15ba87 * Added .libs to the .gitignore files
* Added INSTALL and game/Makefile.am to the repository
* Re-added game/q_shared.(c|h) to the repository -- ideally
  game.so will make callbacks into quake2, this is only
  "temporary" (famous last words)
2002-04-03 00:36:21 +00:00
Jamie Wilkinson
24fb12814e * Replaced gnu.txt with COPYING
* added my TODO list, and the cvs bootstrap script
* Small mods to configure.in, Makefile.am
2002-04-03 00:27:05 +00:00
Jamie Wilkinson
485824e846 * Moved q_shared.(c|h) from game/ into src/
* Copied m_flash.c from game/ into src/
* More edits for include paths
2002-04-02 08:14:08 +00:00
Jamie Wilkinson
8ff1601081 * Moved qcommon/ into src/ as well.
* Removed ARCH from compile options, this means that there
  is no longer a game$(ARCH).so built -- game.so instead.
* Added src/Makefile.am
* Fixed up include paths in main.c, menu.c, vid_menu.c,
  vid_so.c
2002-04-02 06:23:02 +00:00
Jamie Wilkinson
460d5d8dfd * Doing some renovations so I can autoconfiscate the source.
In this installment, I move all of client/ and server/
  into src/
2002-04-02 05:47:23 +00:00
Jamie Wilkinson
7457b38f1e * As per http://www.quakesrc.org/forum/topicDisplay.php?topicID=160,
fix sv_user.c so that macro expansion isn't used on the
  server side, otherwise clients can potentially read
  rcon_password among others
* Forgot to add net_udp6.c from the last relnev merge... oops.
2002-03-21 03:17:25 +00:00
Jamie Wilkinson
065639f494 Merged in Steven Fuller's r0.9 changes:
- mouse wheel support
- swapped SDL mouse buttons to be correct (closes: #17)
- some FreeBSD patches
- Bug Gun + save game crashes fixed (not sure about this
  one)
- Mouse buttons 4 and 5 under SDL
- IPv6 support
- Makefile will build xatrix and rogue source if available
2002-03-12 02:33:43 +00:00
Jamie Wilkinson
a82e3734a8 These assembler files are only used by the software video
refreshers, so let's put them with the rest of it.
2002-03-05 10:04:05 +00:00
Jamie Wilkinson
e30566a57a Note to self: always perform checkins from the top level. 2002-03-03 10:29:39 +00:00
Jamie Wilkinson
12ea33ad62 Moved q2icon.xbm out of the source subdir and into pixmaps/ 2002-03-03 10:24:25 +00:00
Jamie Wilkinson
ec6afebf98 Added a top-level README to let people know not to play with
impertinent subtrees.
2002-03-02 04:04:28 +00:00
Jamie Wilkinson
7e0479e169 Shit, forgot to move glw_linux.h in CVS. 2002-03-02 03:58:46 +00:00
Jamie Wilkinson
2e6851b85b - Merged each of bsd/, solaris/, and irix/ into src/; bsd,
solaris and irix are no longer pertinent, they will remain
  only until I can be sure that the code was merged
  correctly, i.e. for reference purposes only.
2002-03-02 03:56:00 +00:00
Jamie Wilkinson
2daf1584a5 - Renamed source files to remove the name 'linux', as this
gives the impression that these files are os-specific when
  they're not.
    sys_linux.c -> main.c
    q_shlinux.c -> q_sh.c
    qgl_linux.c -> qgl.c
    snd_linux.c -> snd.c
    cd_linux.c  -> cd.c
    rw_linux.h  -> rw.h
    glw_linux.h -> glw.h
    in_linux.c  -> in.c (although this isn't referred to at
                         all in any makefiles anywhere)
- Edited other files to reflect name changes
2002-03-02 03:28:11 +00:00
Jamie Wilkinson
499153913a Changed paths of some #include lines to reflect the new
change.  Why on earth was the code #including headers from
the same directory as "../thisdir/"?  Crazy.
2002-03-01 08:33:25 +00:00
Jamie Wilkinson
912637880c Dammit, missed this one 2002-03-01 08:23:11 +00:00
Jamie Wilkinson
f17ab3c594 Renamed 'linux/' to 'src/' (well, created src/ and moved
linux/* into it) as a part of Jaq's Great Code Restructure.
At this stage, I'm merging all the os-specific subdirs.
2002-03-01 08:13:30 +00:00
Jamie Wilkinson
ef847c61ae More code cleanup. I added -pedantic to the CFLAGS to see
what broke; mainly typecasts.  I've disabled -pedantic again
though, as there are some bugs in svgalib and libc headers
that prevent compilation with -pedantic.  I also didn't
bother to set explicit casts in linux/qgl_linux.c
2002-02-21 01:47:27 +00:00
Jamie Wilkinson
c64a5e828a I've shoehorned a patch from Michael D�nzer that he wrote
for quakeforge a long time ago that allows sound playback on
machines that can't mmap /dev/dsp, like PowerPC machines.

The original patch was archived at:
http://www.geocrawler.com/mail/msg.php3?msg_id=4207733&list=856

The patch went in mostly smoothly, once I found where iD
kept their sound code.  Linux only at the moment, I haven't
bothered to look at snd_*.c in any of the other OS
directories.

It works for me, in that it doesn't interfere with mmapping
on my i386 machine, but I have no PPC machines to test that
it actually does what it's supposed to, so YMMV.
2002-02-20 04:38:42 +00:00