Commit Graph

124 Commits (69ad91c56ba7d38d444709f36e7fa48b1225ecfb)

Author SHA1 Message Date
Dennis Schridde 3f6b52bef1 src/game.c: Minor beautification.
configure.ac: YY_NO_INPUT prevents Flex from defining input(), which we do not need, since we use our own YY_INPUT instead. Maybe we should use Flex's function instead?
lib/script/script_parser.y: scriptStoreVarTypes() was defined but never used.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3300 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-01 15:18:25 +00:00
Dennis Schridde 8d39dc6ce9 Revert pkg-config OpenGL check, since it doesn't work always, probably where Mesa is not installed.
Clean out stray OpenAL header check, forgotten when switching to pkg-config.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3279 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 15:42:59 +00:00
Dennis Schridde 1a6393cfdf We dont have anymore int-to-pointer-cast warnings, yay!
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3278 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 15:36:46 +00:00
Dennis Schridde cdda4cda8a Use pkg-config checks for OpenAL and OpenGL. (OpenGL is actually tested against the Mesa version, and we still check for SDL_opengl.h.)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3277 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-31 15:33:03 +00:00
Dennis Schridde 09a8e33f61 Rename PACKAGE_MAINTAINER to PACKAGE_DISTRIBUTOR to clarify.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3144 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 21:14:02 +00:00
Dennis Schridde 20050d2a3e Add some more output do debug dumps: The maintainer who created the package.
PACKAGE_MAINTAINER and PACKAGE_VERSION should probably also make their way into the logfile...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3040 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-12 18:34:30 +00:00
Gerard Krol b94ac89c03 Revert 3032, as we don't need to support old versions of Flex.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3034 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 21:14:57 +00:00
Gerard Krol a8ffb9b8c2 Add -Wno-unused-function to the compilation options for --enable-debug=yes to silence a warning from flex (GCC4.2, AMD64, Debian Testing).
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3032 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-10 20:40:09 +00:00
Giel van Schijndel bd1609e838 * Add two variables: CC_FOR_BUILD & CXX_FOR_BUILD to aid in building for the "build" machine when cross compiling, instead of the "host" machine
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2999 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-07 21:51:52 +00:00
Giel van Schijndel 357643ef64 * Make sure to use '-lmingw32 -lSDLmain' as the first linked libraries when compiling with MinGW (i.e. link with these __before__ any other libs)
* On MinGW always link in '-lz -lintl -liconv -lfreetype -lfontconfig -lexpat -lgdi32' as well


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2951 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-01 23:59:19 +00:00
Giel van Schijndel d5a4ebe0df * Make the default build for TRUNK a debug build (hey! this is a development build after all...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2849 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-21 21:43:56 +00:00
Giel van Schijndel ed950825a9 * Utilize the Popt library for command line parsing
* Add popt as a build dependency to build systems:
   * autotools
   * Debian package build-depends
   * raw Makefiles
   * Code::Blocks project file
 * Make ParseCommandLine and ParseCommandLineEarly const correct
 * Rewrite ParseCommandLine and ParseCommandLineEarly to utilize Popt


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2800 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-11 17:59: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
Giel van Schijndel 87f96d327e * Make compilation of QuesoGLC optional (i.e. add a --disable-quesoglc to the configure script)
* Disable compiling of QuesoGLC when creating a Debian package


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2728 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 17:04:30 +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
Dennis Schridde f851174e8e Proper linking order
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2699 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-03 22:13:35 +00:00
Dennis Schridde e8f6c5a90f - Use AC_SUBST to define pkg-config style xxx_LIBS variables
- Don't define LIBS anymore, use LDADD instead to add the required xxx_LIBS (useful for tools which don't depend on all the libs WZ needs)
- Cleanup (safer variable expansion, mostly)


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2623 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-25 18:13:30 +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 c812691bb8 Move AC_PROG_CC_STDC for cleaner flow / simpler structure.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2552 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 16:45:01 +00:00
Giel van Schijndel c8052e9d1b * Use autoconf macro AC_PROG_CC_STDC instead of manually appending -std=c99 to our CFLAGS
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2551 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-16 13:09:03 +00:00
Dennis Schridde c7b00fadaf More work on the ICC front:
- Less strict warnings in debug-mode (still unusable, because ICC warns about _a lot_)
- Explicit conversions
- Clarify parameter evaluation order


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2550 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-15 18:09:18 +00:00
Dennis Schridde 7792f1b211 - Be more explicit about what is missing during configure and only ask the user to install something if it is not obvious what is missing.
- Check for pkg-config earlier, pkg-config 0.9 should be sufficient according to configure.
- Add pkg-config m4 file to be able to check for pkg-config where it is not installed.
- Fix typo in ChangeLog, add recent buildsystem changes.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2541 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-09 11:10:47 +00:00
Dennis Schridde b3b4baa9a8 Add extra escaped quotes to DATADIR define so we end up with -DDATADIR="\"...\"" -> one quote for the shell, another one for C.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2539 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-09 10:19:55 +00:00
Dennis Schridde 122f5bf724 AC_DEFINE cannot be used for defining to-be-expanded vars and AC_DEFINE_UNQUOTED shall not (according to the autoconf manual). Additionaly AC_DEFINE_UNQUOTED does not fully expand the var, so it is useless here...
Therefore switching back to setting CFLAGS. Don't ask me why I changed it in the first place...


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2537 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-08 20:36:08 +00:00
Giel van Schijndel 5b1a617631 * Add note about needing to install QuesoGLC to the configure script's GLC header detection
* Add URL to QuesoGLC to the configure script's error messages about GLC

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2525 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-04 10:14:10 +00:00
Dennis Schridde 87d55b978b Basic buildfile support for ICC and silence one warning.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2524 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-02 21:43:43 +00:00
Giel van Schijndel d075832459 * Add font rendering and UTF-8 support through usage of QuesoGLC (an OpenGLC implementation);
* This _will_ require you to install http://quesoglc.sourceforge.net/ on your system to be able to compile (windows binaries are provided on the sourceforge download page as well; just dump them in wz's devpackage directory for now)
 * Currently the font render code is hard-coded to select two fonts: DejaVu Sans Mono regular style (aka "Book") or bold style; if you're package manager doesn't provide these fonts (Debian and derivatives have "ttf-dejavu"), you can get them from http://dejavu.sourceforge.net/

This closes #1 (https://trac.mortis.eu/warzone/ticket/1 I dumped/maintained my patch there)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2521 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-01 19:45:49 +00:00
Dennis Schridde 4c2954bdd4 - Require Ogg/Vorbis. If you rely on Warzone having no sound support please report back!
- Use pkgconfig where possible (sdl, png, ogg/vorbis). Removes m4 file dependencies, tests are faster. If this is a problem for you: Tell me!
- Check against SDL_net using AC_CHECK_* instead of custom m4 macro. Before not much more was tested anyway.
- Enormously simplify OpenGL/OpenAL checks. Functionality should be the same. More diverse error messages. pkgconfig-style LIBS definition.
- Define DATADIR/LOCALEDIR via config.h instead of via CFLAGS. Should move them into dependency checks.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2485 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-28 13:34:23 +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
Dennis Schridde b791c2353d Order...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2392 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 21:01:18 +00:00
Dennis Schridde f75edcb106 libdbghelp.a is now in devpkg-mingw32.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2391 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 20:59:49 +00:00
Giel van Schijndel 707e156265 * Fix warning about "null argument where non-null required"
* Turn macro ALLOC_VARIDENTDECL partially into a static inline function
 * Remove -Wno-nonnull since this warning shouldn't appear anymore now
Patch by pseudonym404 with some changes by me ( http://forums.wz2100.net/index.php?topic=148.msg7723#msg7723 )

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2377 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-14 19:24:29 +00:00
Dennis Schridde 822edbc150 Some long lost change to the NSIS installer.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2244 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-28 12:45:15 +00:00
Dennis Schridde aa9727615c -lz: PhysFS needs this, since sometimes it is not properly linked.
SDL_net.h: Where the SDL headers are not in a standard include path it sometimes seems to have problems with it.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2057 4a71c877-e1ca-e34f-864e-861f7616d084
2007-07-12 15:35:40 +00:00
Dennis Schridde 9a5fd28e0c - More generic cleanup
- Reorder debug=yes CFLAGS so the -Wno- flags are at the end
- Make skybox float-uv aware


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1890 4a71c877-e1ca-e34f-864e-861f7616d084
2007-06-19 16:51:40 +00:00
Per Inge Mathisen 9567ce6391 Add hack to make ./configure --enable-debug=yes work on 64bit CPUs
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1851 4a71c877-e1ca-e34f-864e-861f7616d084
2007-06-12 18:02:56 +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 52486bee8b const const const
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1702 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-25 17:21:13 +00:00
Giel van Schijndel f315843682 * Also add debug symbols to non-debug builds so that our .gdmp files won't be entirely useless (people who don't want these symbols can always strip their binary)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1687 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-23 16:11:34 +00:00
Dennis Schridde 52349eb6cc Another try to workaround systems which usualy disable their POSIX extensions. AC_USE_SYSTEM_EXTENSIONS might have worked as well, but is not present before AC 2.61.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1593 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-06 17:51:04 +00:00
Dennis Schridde 362343969c We dont depend on zlib...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1583 4a71c877-e1ca-e34f-864e-861f7616d084
2007-05-02 16:13:20 +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 419d9215ef Bring back a comment that was removed a while ago
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1508 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-19 18:56:13 +00:00
Ari Johnson 91535c6596 Converted MacOS port to use Xcode to produce a universal binary. Warzone
will henceforth require MacOS 10.4 "Tiger" to run.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1492 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-18 03:10:53 +00:00
Giel van Schijndel aa9a519794 * Remove support for decoding (and encoding in case of screenshot dump code) of JPEG pictures
* Remove some dead (commented out) & dirty code from multiint.c which used JPEG code (image_load_from_jpg)
 * Remove dead (commented out) code from screen.c which used JPEG code (function static GLuint image_create_texture)
 * Remove unused backdrop types from pieblitfunc.[ch]
 * Convert last JPEG files into PNG, add a "comment" property on those: "All of these are converted from JPEG files, so this is JPEG quality."

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1490 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-17 18:24:31 +00:00
Giel van Schijndel 51347f365c * remove MP3 decoding support
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1472 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-16 13:44:41 +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 0bba8687ee Remove AM_GNU_GETTEXT_VERSION since that was only used by autopoint.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1435 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 19:59:19 +00:00