Commit Graph

50 Commits (d3219d93cf8ff83c77c9c891d690d58d3bdd748f)

Author SHA1 Message Date
cybersphinx dd4391990d Get rid of a few unnecessary Makefile.ams. 2010-12-11 16:41:57 +01:00
Cyp 4ccd57baed Add missing "tileset \" to BASELIST, it should now be possible to start games again. 2010-10-18 03:52:05 +02:00
Christian Ohm e1a812fd2e Check if zip understands --filesync, else use -u.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11554 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-30 14:31:04 +02:00
Christian Ohm 651970e1de Use filesync instead of update to create .wz files.
This will prevent warnings when the archives don't exist (for clean builds),
and remove files from the archives that have been removed from the repo (for
unclean builds).

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@11552 4a71c877-e1ca-e34f-864e-861f7616d084
2010-08-28 20:30:48 +02:00
Christian Ohm fa9451b25a Check for (un)zip in configure.ac.
Fixes #1434.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10585 4a71c877-e1ca-e34f-864e-861f7616d084
2010-04-15 21:38:52 +02:00
i-nod 4ad78bf9b2 TCMask feature: shaders infrastructure and TCMask shader, FF fallback is supported for TCMask. Part of #851.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10179 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-07 08:34:17 +01:00
Christian Ohm d7d4c258c4 Actually include challenges in base.wz.
Fixes #1470.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9452 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:39 +01:00
Per Inge Mathisen 4193cd1705 Fix install of palette.txt, closing ticket:1088 reported by gene69
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8463 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:20:03 +01:00
Buginator f9489080a5 Missed a file yet again--all in a ploy to get my commit count up! :D
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8313 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:50 +01:00
Buginator a86cbc2e3c As was discussed on the ML, removing SQL from trunk.
Please test!!
OS X & mingw builds may be broken!


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8312 4a71c877-e1ca-e34f-864e-861f7616d084
2009-11-22 16:19:50 +01:00
Christian Ohm 17d2c4f000 Fix automake for out-of-source builds
Patch by Alexander Stein <alexander.stein@informatik.tu-chemnitz.de>

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7867 4a71c877-e1ca-e34f-864e-861f7616d084
2009-09-27 19:06:34 +02:00
Per Inge Mathisen 111711ad6b trunk: Revert removal of line in Makefile.am that was (at least sometimes) necessary to build base.wz and mp.wz.
Also make sure all .wz archives are generated on 'make dist', so as not to require 'make' to be run first.


git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7620 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
Per Inge Mathisen 9ac1b1adfd Fix 'make dist' for trunk.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@7609 4a71c877-e1ca-e34f-864e-861f7616d084
2009-06-01 21:19:56 +02:00
Dennis Schridde a3f46201bb Fix out-of-source build: Relative paths to srcdir were double applied
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6748 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-28 19:41:20 +00:00
Giel van Schijndel d57d5d5001 Generate the SQL table definition as well
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6313 4a71c877-e1ca-e34f-864e-861f7616d084
2008-11-15 22:02:30 +00:00
Giel van Schijndel 810fac209b * Wrap all file lists in the automake and win32 makefiles across lines such that there's only one file on each line
* Alphabetically sort the file lists

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6144 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-13 13:04:37 +00:00
Giel van Schijndel d871a85964 Add video playback support:
* Add support for decoding and displaying of OggTheora/Vorbis videos
 * Change all references to *.rpl files to *.ogg files (and lower case them)
 * Add a new menu (and config) option for selecting the size at which to display videos (1x (native), 2x, full screen)

This closes ticket:64 and ticket:46

Code changes are ticket:64 (patch by Gerard Krol, Giel van Schijndel and Buginator)

FMVs can be found at http://download.gna.org/warzone/videos/sequences_ogg.zip (for now at least)
Videos encoded by Angus Lees


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6119 4a71c877-e1ca-e34f-864e-861f7616d084
2008-10-08 18:24:19 +00:00
Giel van Schijndel 2c616f323e Trunk is currently broken when playing music and switching between the "base" and "mp" mods, see ticket:57.
This revision fixes ticket:57. We (Buginator, EvilGuru and Giel) decided to use the fix suggested in ticket:57 for now and to use [wiki:Proposal:ModMounting] on a later date. I.e. fix the problem now (however dirty the solution may be), and implement a properly designed one later on, instead of letting trunk remain broken until said proposal is worked out in enough detail.

This revision fixes bug #11847, bug #11875, bug #11898, bug #11976, bug #11989, bug #12017, bug #12250 and bug #12280.

Patch by Buginator and myself


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6028 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-14 20:36:50 +00:00
Giel van Schijndel 5daf3d8035 Simplify the automake processed makefiles in data/
* Getting rid of the custom crafted installation rules
 * Replace them with a single automake primary build rule: nodist_<instdir>_DATA

This closes ticket:62

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5995 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-12 08:19:57 +00:00
Dennis Schridde 050609a81a Include music in base.wz
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5265 4a71c877-e1ca-e34f-864e-861f7616d084
2008-06-18 18:26:49 +00:00
Dennis Schridde e7a0a57b0e Simplify buildsystem for base.wz/mp.wz and make sure to really regenerate the archives.
This would not always work before, since we just depend on the directory, not each file in it.
This oversight made make not recognize when a file was changed and the archive needs to be regenerated.
We now run zip on every invocation of the data target.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5158 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 22:01:07 +00:00
Dennis Schridde 85ab4e02e9 Move base files from data/ into data/base/ (and stuff from warzone.wz to base.wz respecitively).
Should not create any problems, buildsystems were changed (MacOSX, please test).
Reason: Organisation, later: simplification.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5156 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-23 21:42:44 +00:00
Giel van Schijndel bf9c68617a Add the stats-sql directory to warzone.wz as well; this should fix bug #11316
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4543 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-08 11:26:21 +00:00
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