Commit Graph

164 Commits (fcd1455f44192be246c3a59cd64884eb24dc3b6c)

Author SHA1 Message Date
Per Inge Mathisen c232641119 Copy strings back into the C code, and make them translatable by gettext.
Thanks to Huehner for writing the script that transformed calls to strres
back into C strings.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1325 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 20:15:46 +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 e293bf97a3 Fix broken --enable-xxx
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1238 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-15 20:18:28 +00:00
Dennis Schridde ce55d9b457 - Tab-police
- Use Autoconf's internal variables for --with and --enable options
- Use AC_CANONICAL instead of `uname` for Darwin/MacOS detection


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1223 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-10 21:18:09 +00:00
Dennis Schridde d11f5c3665 configure.ac:
- Whitespace changes to sync with branches/2.0
- Fix confusing --disable-data
ChangeLog:
- Import 2.0.6 changes


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1217 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-07 12:33:13 +00:00
Per Inge Mathisen 60555b640c Reorder the CFLAGS assembly. Most flags are now added first
so that they can be overridden by the user, except -O0 for
some build types, which has to go last. Also add autogen.sh
check for flex, and do not make an assumption about default
optimization level (I think this is correct, correct me if
I am wrong).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1203 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-04 22:28:20 +00:00
Per Inge Mathisen ff4dd8ed3d If ${WZ_FLAGS} are to be able to override the default flags
(for example, -O2), it has to be *after* ${CFLAGS} when we
sum up compiler flags. Otherwise the setting of some flags
from within configure will be rather pointless.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1199 4a71c877-e1ca-e34f-864e-861f7616d084
2007-03-04 12:32:02 +00:00
Giel van Schijndel 1278d71894 Apply patch #687 by Gerard Krol ( from file #2014 )
* prevents ${LIBS} variable from being overridden rather than appended to in the autoconf script

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1188 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-27 20:58:27 +00:00
Dennis Schridde ae34883ec2 Allow overriding CFLAGS via commandline parameters.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1186 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-26 20:40:11 +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 d399a897a9 Port of r1164 (exception handler). (Remove dbghelp.h when it is included in MinGW W32API.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1165 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-23 16:36:11 +00:00
Per Inge Mathisen 785daa97e1 Split --enable-debug into four: strict (-Werror),
yes (as before), relaxed (-O2 & -Wextra), and no
(as before). Fix two more reported warnings.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1151 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-20 16:21:19 +00:00
Per Inge Mathisen d3cadd9e4a Start making the code conform to -Wextra
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1146 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 16:46:48 +00:00
Per Inge Mathisen 79b3875fc4 This commit fixes all warnings (on my system). -Werror added for
debug builds. Hopefully this will not cause too much pain, but
rather increase code quality for the future.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1144 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 14:10:44 +00:00
Per Inge Mathisen c81d240cab Add fix for automake versions older than 2.59c. Also comment
out some excessively verbose warning levels added for debug
builds.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1127 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-16 22:18:45 +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 c557889c92 Without -g no debug info at all is placed in the exe...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1113 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-15 12:37:59 +00:00
Dennis Schridde db78168f8a Don't enforce -g0 and -O2 and while we are at it remove the useless -g2, which is the default level of debugging.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1104 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-14 17:50:12 +00:00
Dennis Schridde ee337544f6 Fix buildsystem in src/, was creating wrong _parser.c files.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1061 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-05 10:46:24 +00:00
Dennis Schridde 73121112c9 - Finally Win98 compatible again!
- We apparently missed a contributor in the AUTHORS file...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1023 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-21 18:15:18 +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 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 fafa69842f x86_64 fixes by Pseudonym404. (Incl. some minor other changes, eg in src/game.c)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@854 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-25 01:26:05 +00:00
Dennis Schridde 5293ace6f2 Improve MinGW support. Shamelessly stolen from FreeCiv.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@822 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-06 18:35:59 +00:00
Dennis Schridde 51b358a011 Mark trunk to save me from confusion...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@816 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-05 10:56:51 +00:00
Dennis Schridde a91b3f8803 Support crosscompilation for MinGW32
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@814 4a71c877-e1ca-e34f-864e-861f7616d084
2006-11-05 03:29:51 +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 c661f0ce15 Update website.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@787 4a71c877-e1ca-e34f-864e-861f7616d084
2006-10-09 21:50:50 +00:00
Dennis Schridde 02ee180072 More warnings in debug mode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@715 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-16 15:56:26 +00:00
Dennis Schridde 2449a2f5d3 Fix the version. *sigh, I hope I don't forget anything else...*
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@693 4a71c877-e1ca-e34f-864e-861f7616d084
2006-09-07 18:16:01 +00:00
Dennis Schridde 1c6ef2d789 - Fix VERSION for Makefile.raw
- Fix location of config.h for Makefile.raw
- Remove netlobby* from MSVC project


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@646 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-26 15:21:40 +00:00
Dennis Schridde e117a62324 Use autoconf's config.h instead of an own version.c hack.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@638 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-25 22:27:26 +00:00
Dennis Schridde b356295340 Update version in configure.ac and date in ChangeLog
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@637 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-25 21:47:10 +00:00
Dennis Schridde 320b4426d6 - Change binary name to warzone2100
- Remove revision output (and revision())
- Add --version cl option
- Commandline options are now all --long-opts (this makes future -s short-opts possible)
- -1024x768 has changed to --viewport 1024x768
- Reodered --help alphabetically


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@623 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-24 22:48:56 +00:00
Dennis Schridde 4d55a6821e Changed/unified namings.
Project: Warzone Resurrection Project
Product: Warzone 2100
Binary: warzone



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@621 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-23 17:48:47 +00:00
Ari Johnson 6585873f04 Made configure.ac much smarter about MacOS X OpenGL and OpenAL frameworks
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@620 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-23 15:51:33 +00:00
Dennis Schridde 3376c0909f Patch from Gentoo bug #141661 to not override Ogg's own --with-ogg switch (http://bugs.gentoo.org/show_bug.cgi?id=141661)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@615 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-23 13:53:47 +00:00
Dennis Schridde cdf3cf2eb2 Fix Gentoo bug #141661 (http://bugs.gentoo.org/show_bug.cgi?id=141661)
Configure could fail to detect ogg-vorbis due to a missing "test".


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@606 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-22 11:24:49 +00:00
Ari Johnson b67900399b Reverted to AC_CONFIG_HEADER and made a note in macosx/README.BUILD.txt regarding the required version of automake
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@598 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-21 11:15:27 +00:00
Ari Johnson 737f37663e AM_CONFIG_HEADER replaces AC_CONFIG_HEADER to avoid complaints from automake
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@592 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-20 11:16:40 +00:00
Dennis Schridde 3210bebd6b - configure.ac, configure.mk: Define NDEBUG for non debug builds (disables assert())
- mem.c: Beautify memFree ASSERT(())


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@589 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-19 22:24:07 +00:00
Dennis Schridde 77ed8b86a7 - Require automake 1.8 in autogen.sh to fix bug bug #6683
- Remove obsolete macros from configure.ac


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@582 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-19 09:39:35 +00:00
Dennis Schridde b3209ba881 Update to version 2.0.4_rc2
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@574 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-16 20:30:02 +00:00
Per Inge Mathisen 65175a10ca Add support for MacOSX and big endian platforms. Patch by
iamtheari@gmail.com with changes by me.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@558 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-12 10:45:49 +00:00
Dennis Schridde 47af9cd71c - Set version to 2.0.4_rc1
- Fix typo in TODO
- Add a Debugging section to the CHANGELOG


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@547 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-07 12:30:07 +00:00
Dennis Schridde 7cf742e5b3 Finaly fix configure.ac to export REVSION=`svnversion -n .` instead of the current revsion, so we get the correct revision on every make.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@515 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-03 09:55:24 +00:00
Dennis Schridde bb4b7e82b6 - Update versioninfo in configure.ac and warzone.rc
- Cosmetic change in debug.c (Mark begin of the log with "---")
- Fix bug where PhysFS said WriteDir "Warzone-2.0\" is insecure and refused to create it (bug#6466)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@510 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-31 17:02:45 +00:00
Per Inge Mathisen 0c376b9854 Fix configure.ac - cannot remove the renderer=opengl variable just yet!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@495 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-22 23:32:49 +00:00
Dennis Schridde 5bdfeec464 Remove ivis02 (software renderer)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@494 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-22 22:23:43 +00:00
Dennis Schridde 4c2ca93992 Fix $REVISION=`svnversion` being expanded autoconf process instead of in configure process.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@476 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-19 21:51:44 +00:00
Dennis Schridde eda1fdc2a4 Make it possible for releases to define their own revision (for display in mainmenu).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@472 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-17 20:04:27 +00:00
Dennis Schridde 349b8de00e - AutoPackage download path change
configure.ac:
- Make OpenGL mandatory
- check for jpeg/png headers
- merge in my DEFAULT_DATADIR patch, because in the AutoConf manual it is listed as prefered
- Change YFLAGS/LFLAGS to make it easier for me to play with Bison/Flex
Others:
- Dont require -datadir to end with a dir separator
- Small PHYSFS fix

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@463 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-06 21:45:04 +00:00
Angus Lees 533a4ba5b6 Define correct DEFAULT_DATADIR variable
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@461 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-06 21:28:37 +00:00
Dennis Schridde e9e58f3664 - Limit the framerate to 30 fps. Easily imported functionality from SDL_gfx project (http://www.ferzkopp.net/Software/SDL_gfx-2.0/).
- Fixed previous patch yet again.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@458 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-05 20:39:13 +00:00
Dennis Schridde 22aa133fca Fixed bug#5883 where Flex or Bison could be not installed without warzone complaining about it.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@457 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-04 22:21:04 +00:00
Dennis Schridde 357c07374f - Added Ben Russons nickname
- Fixed configure.ac which was requiring AutoConf 2.60 due to an autoupdate

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@447 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-30 15:37:31 +00:00
Dennis Schridde ad2abfa53f Updates and debugging style change
- Updated m4 scripts and configure.ac
- Updated AUTHORS and CHANGELOG
- Output debug part in debug mode ("part: debug message")


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@445 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-29 11:27:14 +00:00
Dennis Schridde efbe0441c1 Fixed broken data/*.wz creation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@444 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-22 14:30:56 +00:00
Dennis Schridde ed5fb5102a Correct unnecessary ALut dependancy and merely rewrote the file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@440 4a71c877-e1ca-e34f-864e-861f7616d084
2006-06-21 10:46:56 +00:00
Dennis Schridde e3dedfdce0 - Additional requirements for the AutoPackage.
- Incremented version number for next release.
- Removed creation of autopackage/default.apspec in configure.ac, because it is useless for usuall builds and automatically created by makeinstaller on each run.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@421 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-23 11:02:58 +00:00
Dennis Schridde 40090410ac - Cleaned up stubs
- Removed unused/outdated ivis02/Ivis02.dsp/.vcproj and  src/mpdpxtra.[ch]
- Replaced src/mplayer.c with a stub, containing only mplayerSubmit()
- Added DEPRECATED warnings
- Added documentation for WZ_DEPRECATED
One commit follows, to finish the move from ivis02/v4101_stub.c to ivis02/v4101.c



git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@415 4a71c877-e1ca-e34f-864e-861f7616d084
2006-04-08 19:14:30 +00:00
Dennis Schridde 16fe51a87e Added AutoPackage (http://www.autopackage.org/) support.
Show version in mainmenu.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@381 4a71c877-e1ca-e34f-864e-861f7616d084
2006-01-15 11:40:43 +00:00
Rodolphe Suescun 6fedcb3d4d Fixed crash in sound lib.
Fixed shadow-related problem.
Fixed polygon flags (face culling and colour key related).
Added new tileset from Grim.
New warzone logo.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@365 4a71c877-e1ca-e34f-864e-861f7616d084
2005-11-29 16:20:35 +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