Commit Graph

75 Commits (686645e1a6720505024b20d7eab1c2c424f8b69a)

Author SHA1 Message Date
automerge 40b3e02ffc Merge branch 'bugfixes' 2012-11-03 00:42:03 +01:00
cybersphinx 182e884552 Rename autorevision.tmp to src/autorevision.cache.
Also remove another stray backslash, now make distcheck should work
again.
2012-10-30 17:35:58 +01:00
cybersphinx 85ec3010ca Don't try to ship the removed autorevision.sh. 2012-10-30 16:34:40 +01:00
dak180 83c7199392 Use the latest version of autorevision.
From https://github.com/Autorevision/autorevision
2012-10-28 11:17:35 -04:00
Per Inge Mathisen 7bc528ebd7 Merge branch 'bugfixes'
Conflicts:
	src/qtscriptfuncs.cpp
2012-06-25 21:37:47 +02:00
dak180 2e72860fb1 Be somewhat less unaimed in putting the image tool in the tarball. 2012-06-17 16:58:29 -04:00
dak180 d9aab02307 Add tools/image to the tarballs.
Closes #3528.
2012-06-17 15:25:44 -04:00
Per Inge Mathisen 3daad92c94 wzscript: Readd global object documentation from qtscriptfuncs.cpp 2012-04-08 22:38:13 +02:00
cybersphinx f1fd685071 Only copy javascript doc if we build out of tree.
Also run hevea twice to get cross-references right.
2012-02-15 23:09:18 +01:00
cybersphinx dfaadbc5d2 qtscript: Add an html target using hevea for the docs. 2012-02-10 22:39:38 +01:00
safety0ff 9cb0afa9b8 Integrate QuesoGLC.
Since no fixed release is out at the moment, always use ours.

Closes #2828.
2012-01-08 22:53:42 +01:00
Per Inge Mathisen ee5103479c Further improvements to the qtscript documentation. 2011-12-29 13:08:21 +01:00
Per Inge Mathisen 30f9c0091f Add autogeneration of PDF documentation for qtscript API using LaTeX. 2011-12-29 02:19:30 +01:00
dak180 f6d963963c Adjust the xcode build to moves and additional files.
Some additional changes to set up support SDL for mac builds.
2011-12-12 09:40:49 -05:00
Per Inge Mathisen 063fc63629 Initial build system for qt/sdl-backend switcher 2011-12-11 15:30:54 +01:00
cybersphinx 307c99f367 Get rid of the unused C++ autorevision.
Refs #2900.
2011-09-25 19:57:56 +02:00
Per Inge Mathisen d2009baa89 "make distcheck" errors about some files required for complete build missing
from tarball. Patch by cazfi, closes ticket:2882
2011-09-06 21:16:52 -04:00
cybersphinx 781ea14a94 Include Debian packaging scripts in the tarball.
Fixes #2852.
2011-08-15 00:31:54 +02:00
Per Inge Mathisen 23b4d3e8a1 Add map/tools to ordinary build system. 2011-07-28 01:32:09 +02:00
Rene Jochum 616c6c4086 Replace BSON with QJson. 2011-07-11 02:33:33 +02:00
cybersphinx e85f9fdfbf Actually build bson. 2011-07-08 18:14:08 +02:00
Per Inge Mathisen 10a78a4a7e Merge in qtgame project and make use of its trap cursor support. 2011-07-02 00:25:14 +02:00
cybersphinx a42e26864d Fix compilation. 2011-05-22 04:46:05 +02:00
Rene Jochum 29bbd8fb3a Move lib/netplay/miniupnpc to 3rdparty/miniupnc on autotools and ...
hopefully MSVC.
2011-05-22 04:10:04 +02:00
Per Inge Mathisen d78a8eb8ad Use QSettings instead of our homebrewed version of iniparser to reduce maintenance load. 2011-04-01 20:31:15 +02:00
cybersphinx 0af9d47a34 Call autorevision.sh instead of compiling and running the C++ autorevision. 2011-03-07 01:18:18 +01:00
cybersphinx c8efe55207 Don't run the fixbrokendependencies script on every build. 2011-01-08 18:27:34 +01:00
Per Inge Mathisen 67e9635f9f Merge the ivis_common and ivis_opengl directories, only five years and two months after I originally split them apart. 2010-12-31 22:37:14 +01:00
Cyp 4a16961c34 Don't fail to build when building from tarballs.
Apparently fixbrokendependencies doesn't get included in the tarballs, despite being committed.
2010-12-21 15:09:48 +01:00
Cyp 2bcb709cf4 Move broken dependency hack out of most Makefile.am's, except the for the root. 2010-12-16 23:14:38 +01:00
cybersphinx dd4391990d Get rid of a few unnecessary Makefile.ams. 2010-12-11 16:41:57 +01:00
Christian Ohm d726e372cf Remove .svn folders for make dist.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10237 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-13 22:57:23 +01:00
dak180 80b379fcbf Externalize fetch scripts.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@10056 4a71c877-e1ca-e34f-864e-861f7616d084
2010-03-04 19:07:36 +01:00
Christian Ohm eeeb453139 make dist: Include whole macosx directory instead of listing every file.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9982 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-23 15:50:47 +01:00
dak180 1f2b4f201a Add LangDis to the makefile.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9823 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-15 21:50:10 +01:00
Cyp e1bfee9a4c make: Better (hopefully) hack to fix broken dependency files.
Probably closes ticket:1590.

git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9817 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-15 20:51:08 +01:00
dak180 5fc308b749 More encoding fixes and fix some names.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9816 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-15 20:51:08 +01:00
Cyp 12c488c70d Fix race condition in pathfinding caused by -Wdeclaration-after-statement. Pathfinding jobs should no longer get lost.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9788 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-13 23:04:59 +01:00
dak180 1eabbb6f5a Externalize the xcode build settings for better readability and fix .strings mime-type.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9761 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-11 20:14:33 +01:00
dak180 6bfd2ce794 Add .lproj bundles for mac localization.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9740 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:28:17 +01:00
Cyp 275e260a89 Fix building with PD-ksh on BSD. Reports and some patches from brad0. (svn -r9444)
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9445 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:39 +01:00
Cyp 9e17ea8d25 make: Fix previous deps hack to avoid errors on fresh builds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9375 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:25 +01:00
Cyp ffa10c5113 make: Don't give make errors when switching between trunk and branches, even with out of tree builds.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9296 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:14 +01:00
Cyp 809098735d make: Don't give make errors when switching between branches.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9286 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:13 +01:00
Christian Ohm df7b9dff0c Add Mac project files to make dist.
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@9221 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:27:02 +01:00
Giel van Schijndel 2b8c85a686 Include source:trunk/autorevision.conf in `make dist`
git-svn-id: https://warzone2100.svn.sourceforge.net/svnroot/warzone2100/trunk@8956 4a71c877-e1ca-e34f-864e-861f7616d084
2010-02-09 20:04:01 +01:00
Per Inge Mathisen 5da9b30f7d Fix missing files in makefiles so that 'make dist' can be run again.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6792 4a71c877-e1ca-e34f-864e-861f7616d084
2009-03-07 18:09:58 +00:00
Per Inge Mathisen 58546965b7 Delete commented out references to non-existent files from gamedesc.lev
Delete two unused and broken map files that either belongs to an expand mission or is unreferenced.
Add basic unit testing framework for testing all map files in data/base.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@6728 4a71c877-e1ca-e34f-864e-861f7616d084
2009-02-26 19:41:25 +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 6a6ac6cad6 Remove unused m4 macros
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5986 4a71c877-e1ca-e34f-864e-861f7616d084
2008-09-11 05:41:41 +00:00