Giel van Schijndel
42f7e913b3
Also check for Libiberty and BFD when crosscompiling for Windows
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4595 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 01:09:51 +00:00
Giel van Schijndel
b7c92bd0a1
GLC depends on FontConfig and FreeType, so link against that as well when crosscompiling for Windows
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4592 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 00:09:32 +00:00
Giel van Schijndel
0de6dfd9b3
* When checking for libraries Popt and PhysicsFS make sure to link against ${WIN32_LIBS} as well
...
* Expand ${WIN32_LIBS} to include -lz which PhysicsFS depends on and -lintl and -liconv which Popt depends on
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4591 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-14 00:02:36 +00:00
Giel van Schijndel
7ed537a019
Pass the ${PREFIX} variable from the crossbuild script to pkg-config
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4590 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:53:30 +00:00
Giel van Schijndel
2e758ba89d
add an --enable-static parameter to the configure script which tells pkg-config to pass libraries required for static linking
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4589 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:42:04 +00:00
Giel van Schijndel
6f0a6c4988
Also use a CPPFLAGS_FOR_BUILD (alongside CC and CXX) and pass it to the configure script as well
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4588 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-13 23:00:40 +00:00
Per Inge Mathisen
3c749e2ee3
Fix bug #11467 : Assert when loading a savegame in campaign. Reported by Dale Gill.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4554 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-09 19:54:14 +00:00
Per Inge Mathisen
274ae7c9a4
Enforce strict function prototypes for autoconf builds, and fix function prototype problems.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4487 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 15:34:55 +00:00
Giel van Schijndel
665e57dc12
Move the exceptionhandler to a directory of its own
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4484 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 15:11:43 +00:00
Per Inge Mathisen
be566a7d6d
Add -Wcast-align and -Wmissing-declarations to autoconf debug builds, and fix warnings.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4403 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-28 23:28:44 +00:00
Per Inge Mathisen
38cfafe7b8
Rename --disable-debug to correct --enable-debug in configure --help
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4333 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-25 19:42:21 +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
d58ef8fa12
Workaround stupid autoconf CFLAGS default
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4008 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-11 11:25:20 +00:00
Dennis Schridde
50ecf5e339
YY_NO_INPUT is now set just where needed. Apparently I forgot to commit this before.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3990 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 11:09:41 +00:00
Dennis Schridde
d8409c9819
- Don't define CFLAGS anymore, export WZ_CFLAGS instead, which can be overridden by make commandlines
...
- Set -DYY_NO_INPUT only in those places where needed
- Add some previously forgotten CFLAGS where needed
- Remove extranous -lintl from WIN32_LIBS
- Remove apparently unnecessary directory from Mac include (png_util doesn't need it either)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3986 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-10 02:01:46 +00:00
Dennis Schridde
9f44219b1c
Move addition of CFLAGS from configure.ac to the places they are actually needed.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3983 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-09 20:08:42 +00:00
Per Inge Mathisen
51ca960ed5
Add -Wmissing-field-initializers, fix missing field initializers, and make source
...
compile even if GCC is not C99 compatible.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3944 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-07 18:27:43 +00:00
Giel van Schijndel
8425a89dbc
* Add SQLite 3.5.4 to the source tree (3.5.6 gives some warnings @ compile time which I don't trust)
...
* Patch it up so that the compiler doesn't generate 'cast to pointer from integer of different size' warnings (as these are harmless, but annoying if -Werror triggers compiler failure)
* Add this patch as lib/sqlite3/sqlite3.diff (to be able to keep track of it)
* Add it to the autotools, raw makefiles and Code::Blocks build systems, XCode and MSVC (and any others I'm forgetting here) still need updating
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3897 4a71c877-e1ca-e34f-864e-861f7616d084
2008-03-02 22:37:25 +00:00
Dennis Schridde
bdc4c57fa7
Port r3843 from branches/2.1: Autogenerate playerX.slo files
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3844 4a71c877-e1ca-e34f-864e-861f7616d084
2008-02-20 11:54:29 +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
Giel van Schijndel
f558eb0d61
Revert unintentional part of r3612
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3613 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 23:39:31 +00:00
Giel van Schijndel
4f93b03142
Make function-pointer array pLoadFunction a local (but still static) array instead of global
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3612 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-30 23:38:05 +00:00
Giel van Schijndel
1502e29c80
Include pkgconfig CFLAGS into our CPPFLAGS instead as they're really preprocessor options (as opposed to C compilation options)
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3571 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 17:12:48 +00:00
Giel van Schijndel
0180eea2aa
Remove a strange left-over like variable invocation from configure.ac
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3570 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 17:05:01 +00:00
Giel van Schijndel
f7c58e57bb
Replace some CFLAGS which where really intended for the preprocessor with CPPFLAGS instead
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3568 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-27 16:56:05 +00:00
Per Inge Mathisen
ecc82d493e
Add two new --enable-debug modes, profile and debugprofile, to generate CPU usage profiles.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3501 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-16 21:16:11 +00:00
Dennis Schridde
46ee786db6
We never use Ogg nor Vorbis directly, so we should only implicitly depend on it via vorbisfile.
...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3363 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 20:42:23 +00:00
Dennis Schridde
e5babd8ba5
Most of the current WIN32_LIBS and WIN32_PRE_LIBS are only required because we choose to compile statically.
...
So they should be pulled in where static compilation is choosen: Via settings LIBS for configure in the __BUILD_SCRIPT, eg.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3362 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-05 20:41:39 +00:00
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