Commit Graph

27 Commits (f64e3a80332ec357b8e77ff61484c33fb77a3d95)

Author SHA1 Message Date
Per Inge Mathisen fec3b1ca08 Indexed colour usage has been eliminated, so remove its support code.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3529 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-21 17:06:31 +00:00
Gerard Krol 0c5fff97b5 Patch by Kelly Anderson: Subtile changes to allow for building outside the source tree.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3406 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 13:24:25 +00:00
Giel van Schijndel 2e76e8d1f9 * Fixes bug #3 (trac-ticket), apparently in r3343 I forgot to change the Makefiles to include the tagdefinitions directory in the warzone.wz zipfile (the directory testdata was still used)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3352 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 13:37:49 +00:00
Dennis Schridde c540d8c070 Remove automake workarounds and require 1.10.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2995 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-07 21:09:34 +00:00
Per Inge Mathisen 43196aaf94 Add testdata to list of directories to install. Bug reported by Buginator on IRC.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2667 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-29 20:14:03 +00:00
Dennis Schridde cab88a8a7d - Make "make -C data data" recursively build mods as well. SUBDIRS is apparently ignored for target!=all.
- Add ABOUT-NLS, which is apparently required by gettext. (Copied from gettext-0.16.1)
- Update po


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2465 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-22 11:45:49 +00:00
Giel van Schijndel 436523e700 * Don't add data/locale to warzone.wz since gettext can't access these files through PhysFS but needs direct access to them (through stdio.h stuff)
* ./configure && make && make install (and the NSIS installer) will make sure that the gettext message catalogs are in a decent location

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2407 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-17 18:37:08 +00:00
Giel van Schijndel b360d380b2 * Move data/grim to data/mods/global/grim
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2404 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-17 17:42:17 +00:00
Giel van Schijndel cbb398882d * First create $(DESTDIR)$(pkgdatadir)/mods/global before installing grim.wz in it
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2390 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 20:40:11 +00:00
Giel van Schijndel 33aea77e60 * Add Grim's GFX mod (this version would work cleanly with r2123; I'll update it soon after this commit)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2386 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 17:38:28 +00:00
Dennis Schridde ebb1d7a918 Translate3.patch by Martin Koller. Had to Wiggle names.txt, but it seems to have cleanly applied.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2241 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 11:35:26 +00:00
Dennis Schridde e02cb3b864 Correct Thomas' entry in the AUTHORS file and remove --enable-data (data is built automatically on install or on make -C data data if needed.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1517 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-22 15:27:02 +00:00
Dennis Schridde ccbaba79ca Add --icondir and --applicationdir switches for finer control over installation.
Optimization needs to be taken care of. We currently overwrite whatever switch (-gX/-OX) is given to configure on the commandline.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1184 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-26 20:10:51 +00:00
Dennis Schridde d80e06e2cd Port of r1114 (buildsystem/installation improvements)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1115 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-15 15:36:25 +00:00
Dennis Schridde 7046437cf1 Fix building data/
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1099 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-13 22:01:05 +00:00
Dennis Schridde 31f3b2c67a Fix data Makefile.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1026 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-21 19:15:09 +00:00
Dennis Schridde 2e967ee264 More merging and Makefile improvements:
- Remove (wrong) double definition of main
- Make enabling/disabling of DATA and INSTALLER easier in raw Makefiles
- Remove COMPRESS and COMPILER from raw Makefiles
- MAKENSIS is no longer mandatory for raw Makefiles


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@979 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 01:28:01 +00:00
Dennis Schridde 52e8d3b435 Forward port some missed changes
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@920 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-25 01:43:01 +00:00
Dennis Schridde e189e064c0 Forward port make install fix for Automake < 1.10
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@916 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-23 17:26:58 +00:00
Dennis Schridde b0eceecf36 Backport changes from branches/2.0. (AutoPackage 1.2 support)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@797 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-30 17:15:30 +00:00
Dennis Schridde ddd78550e9 Fixing data/Makefile.am, which broke during resolving conflicts
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@438 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-16 21:33:37 +00:00
Dennis Schridde 55ab0d8a3b Fixed mp.wz creation.
Thanks to imidiate bugreport by Jocke.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@437 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-16 21:11:20 +00:00
Dennis Schridde 194026f379 Rewritten mod loading
This patch includes:
- Strongly modified way of adding mods, maps and addons
- Make nearly everything use PhysFS (just netlog and debug stay)
- Convert several DBERRORs etc. to debug()

The new modloader works like this:
For every mod supplied on the commandline ("-mod") (maximum of MAX_MODS=100) keep it in mind (char * global_mods[]).
After initializing PhysFS do scanDataDirs(), which tries to register all possible paths, global_mods[] and maps with PhysFS. Dont check wether we succeed, only at the very end check if we got a "gamedesc.lev".

When we buildMapList(), mark "gamedesc.lev" as MOD_CAMPAIGN, "addon.lev" and every user supplied map as MOD_MULTIPLAY.

When we loadMods() modify the searchPath according to the supplied mods.
Note: T1 maps like Sk-Rush come from gamedesc.lev, are marked MOD_CAMPAIGN and thus wont load any multiplay_mods[], even if the user starts a multplayer game. Instead those maps are threated as campaignmode and will only load campaign_mods[].

This patch requires the "mp" patches to be either in ProgramDir/mp, in ProgramDir/data/mp or in ProgramDir/mp.wz
This is because one cannot add warzone.wz/mp to the search path if warzone.wz is an archive.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@436 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-16 19:10:23 +00:00
Dennis Schridde 61c48ae09e Fix for outdated Makefile.am after merging 0x patches into mp directory
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@435 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-11 22:35:16 +00:00
Per Inge Mathisen 1fc13aa748 Fix autoconf 'make install' which was installing in one 'warzone' directory too deep.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@404 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-11 16:34:18 +00:00
Per Inge Mathisen ca69e8eac4 Support "make DESTDIR", needed apparently for Gentoo and autopackage builds. Thanks to
devurandom for notifying me of the problem.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@374 4a71c877-e1ca-e34f-864e-861f7616d084
2005-12-10 00:49:08 +00:00
No Author 5ba7ddac6b Create final repository structure.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@362 4a71c877-e1ca-e34f-864e-861f7616d084
2007-06-28 17:47:08 +00:00