Commit Graph

98 Commits (78c568d5c5bde112f4bdd9f3a69a39e01fdfe6c1)

Author SHA1 Message Date
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
Dennis Schridde 751e6c44f7 Use pgettext instead of a custom implementation.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1423 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 17:36:16 +00:00
Per Inge Mathisen 96cb7cafc5 Ressurect -Wno-unused-label. Reorganize string.h includes so that
_GNU_SOURCE can take effect first, to silence stpcpy() warnings from 
bison generated code.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1416 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 12:44:50 +00:00
Dennis Schridde b3e17f6064 Make strict the default debug mode.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1408 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 19:31:29 +00:00
Giel van Schijndel ee27f41be7 * add -Werror-implicit-function-declaration to CFLAGS
* Fix a spelling error in a string in src/droid.c
 * `make -C po update-po`

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1406 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 15:02:04 +00:00
Dennis Schridde 8952155c7a - Add -Wextra to debug=yes, as it doesn't generate so many new warnings
- Add -Wno-nonnull to debug=strict to make it compile (Remove it from AM_CFLAGS)
- Remove -Wno-unused-label as this warning is not generated anymore
- Fix a "... from incompatible pointer type" warning which led to a lot of strings (and associated functions) in the widget area becoming const
- Maybe found the reason for images in UTF-8 strings


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1405 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-09 14:41:22 +00:00
Dennis Schridde 6f332421c6 Small change to match branches/2.0
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1369 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-05 17:30:39 +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 f2eb836b61 - Remove unnecessary files in m4
- Fix autopoint detection in autogen.sh
- Require only gettext 0.14 in configure.ac


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1334 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 18:08:23 +00:00
Dennis Schridde 3b09a756df - Remove unneeded gettext files and instead create them via autopoint
- Remove unneeded checks from autogen.sh (all of them are also checked in configure.ac)
- Move AM_CPPFLAGS=-$(top_srcdir), which was included in nearly every Makefile, to configure.ac
- Remove -g from CFLAGS for usual builds. This should be set by the buildscripts instead
- Remove CFLAGS_OVERRIDE, which was rendered obsolete by the above change


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1332 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 17:21:05 +00:00
Dennis Schridde 0aa7cd1b8c Comply with the gettext manual and move path fallbacks to the common location
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1328 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-01 21:15:07 +00:00
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