Ginger88895
/
warzone2100
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,204 Commits
1 Branch
0 Tags
544 MiB
Commit Graph

53 Commits (24a67fa1dadc14e3561ae5828a9f6991334183e0)

Author SHA1 Message Date
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
Giel van Schijndel 6254f73329 Remove now useless testcase directory "tests" as its only testcase (t1000: tested level_parser.y) has no code left to test (due to r5163) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5165 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-05-24 12:48:26 +00:00
Giel van Schijndel 35d84d2fbf Add the beginnings of an external unit test framework (i.e. it doesn't run in Warzone itself, it just links to pieces of Warzone's code to test it): 
* Add a new directory with unit tests (/tests/)
  * Run `make test` in this directory to execute all these unit tests and get reports from them if they fail
 * Add a single unit test to the directory which tests level_parser.y and the input it should & shouldn't accept


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4883 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-05-02 18:44:01 +00:00
Dennis Schridde 02fb26efff Adapt autotools build to r4062 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4065 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-03-15 17:03:58 +00:00
Dennis Schridde da7212b287 Merge r3827 + r3828 from branches/2.1. This fixes bug #11087. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3830 4a71c877-e1ca-e34f-864e-861f7616d084
 2008-02-18 15:39:42 +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 1d1e96fb4f Remove empty NEWS and README files 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2923 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-12-01 13:30:32 +00:00
Dennis Schridde 364a32d1de Remove QuesoGLC from the buildsystem. Reasons: 
- It builds examples, etc. by default, which is annoying
- It will install along with Warzone, which is dangerous


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2761 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-11-09 19:32:01 +00:00
Dennis Schridde 8fd75e854c Only try to build QuesoGLC if we downloaded the svn:external. Should fix it for source tarballs and exotic svn updaters. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2714 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-11-04 16:59:35 +00:00
Dennis Schridde 7ca4f62452 Recurse into QuesoGLC directory for building. Not fully complete, since we cannot yet use the result of that. 
Need to investigate further on howto best setup autotools to accomplish that.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2713 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-11-04 16:29:20 +00:00
Giel van Schijndel 9c3db2f6e6 * Add building of Autorevision to the automake build-system 
* Make the automake build-system use Autorevision to produce src/autorevision.h
   * Add it to the clean-local target as well!
 * Ignore src/autorevision.h (in "svn status")


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2579 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-10-21 18:53:24 +00:00
Giel van Schijndel 1f78a7fcef * Add docs/ directory to automake tree; 
* make sure that it's contents are installed as docs when --install-data is used


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2572 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-10-20 19:03:27 +00:00
Dennis Schridde e305f2a566 Move icons and desktop into /icons/. Autotools work, Debian buildscripts may need further adjustments. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1838 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-06-07 22:51:52 +00:00
Dennis Schridde 25aa853f29 - Remove lots of inclusions of windows.h (and move inclusion of frame.h up) 
- Remove "-%token <sval> TEXT" from audp_parser.y since it clashed with declarations in MinGW's Windows headers. It does still compile and run, but this may have harmed something anyway. Please check!
- Hack around DATADIR being defined by objbase.h in MinGW by undefining it before the inclusion of shlobj.h (incl. in main.c) This only works since the case that DATADIR is actually used on Windows is extremely rare.



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1437 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-04-11 14:21:45 +00:00
Dennis Schridde b2ca1a6825 Autopoint removal by Per. 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1350 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-04-03 14:04:21 +00:00
Dennis Schridde 6180aab09d - Make make visit intl/ 
- Update dbghelp.h to Wine 0.9.34
- Sync with branches/2.0


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1313 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-03-31 18:04:43 +00:00
Dennis Schridde c5e611767b Gettext support (0.16.1 included) 
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1310 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-03-31 15:34:35 +00:00
Dennis Schridde 4107156595 Another buildsystem update: 
- Do not modify CFLAGS inside automake Makefiles
- Add NEWS and INSTALL to comply with GNU standards
- Use aclocal's include functionality instead of acinclude.m4


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1296 4a71c877-e1ca-e34f-864e-861f7616d084
 2007-03-29 12:41:18 +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 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 1b7a63f6ef NSIS support for automake. 
raw Makefiles might be broken, please report back!


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@935 4a71c877-e1ca-e34f-864e-861f7616d084
 2006-12-27 21:44:46 +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