Commit Graph

43 Commits (beb24f3d10b9b67e59a2d2b4e2cb1e20dcea6aa7)

Author SHA1 Message Date
Giel van Schijndel aaf2a42747 * Synchronize raw Makefile system with changes to NSIS file in r2466
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2475 4a71c877-e1ca-e34f-864e-861f7616d084
2007-09-25 16:11:24 +00:00
Giel van Schijndel e28c8c4606 * Add support for compiling with gettext to the raw Makefiles (note this _does_ require the latest devpkg)
* Add the ability to compile .mo catalog files from gettext .po files to the raw Makefiles (all catalog files are dumped into data/locale)
 * On Windows make gettext use the LOCALEDIR (as defined in makerules/config.mk) which is a subdirectory of the directory that contains Warzone 2100's executable as it's locale directory

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2394 4a71c877-e1ca-e34f-864e-861f7616d084
2007-08-16 22:50:05 +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
Giel van Schijndel 79b8983220 * remove ^wrong^ rank translation of "Green" from Dutch translation (looks to much like translation for "Rookie")
* revert changes to po/Makefile.in.in from r1417
 * add some makevars to raw makefile system
 * add definitions of gettext macros P_ and NP_ to raw makefiles (and remove Q_ and Qn_)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1436 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-10 22:09:53 +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
Giel van Schijndel e1a839ced5 * add gettext generation support to raw makefiles (is far from nice, but works)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1385 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-06 01:51:07 +00:00
Giel van Schijndel 0730665b1e fix raw makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1338 4a71c877-e1ca-e34f-864e-861f7616d084
2007-04-02 20:49:14 +00:00
Dennis Schridde 1f51cc6520 Adapt raw Makefiles to r1164
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1166 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-23 17:27:33 +00:00
Per Inge Mathisen 9a0d08f699 Clean up IMD loading, informed by -Wextra, removing lots of redundant and
unused code. Also add -Wno-unused-label to Makefile.raw builds, too, to
skip the warning generated by flex that we cannot fix.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1148 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-19 17:37:11 +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
Giel van Schijndel 0fcfaebdd0 fix linker order:
* PHYSFS sometimes depends on libZ (e.g. when PHYSFS_close is called on an opened file, which it now probably never is since WZ links fine with wrong linker order)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1091 4a71c877-e1ca-e34f-864e-861f7616d084
2007-02-11 13:28:44 +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 0f0da23e46 Raw Makefiles: Compatibility fix for make versions < 3.81
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1009 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-15 13:26:01 +00:00
Dennis Schridde 8636f63a4c Raw Makefiles: Forgotten support for mingw32 libaries
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1003 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-13 21:16:18 +00:00
Dennis Schridde 52f1b21e24 Raw Makefiles:
- Check for MAKENSIS if INSTALLER is set
- Seperate windows-support from mingw32-support


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@1000 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-13 20:55:33 +00:00
Dennis Schridde f723a42e50 Proposed fix for non-MSVC buildsystems
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@984 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 22:07:58 +00:00
Dennis Schridde 6118395dfc Stop confusion: COMPILER also removed from config.mk.tmpl
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@980 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-09 01:34:38 +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 f28630f634 Forgotten change
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@978 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 23:48:12 +00:00
Dennis Schridde 027b868929 Change libraries for raw Makefiles again. This should now more closely represent the sdl-config.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@976 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 23:25:38 +00:00
Giel van Schijndel 38a3d8ee82 * cast some void*(*) variables to their respective types
* remove -fno-gnu-keywords from GCC because it seems to be only for C++/ObjectC (Doh!), and the variant for C (being -fno-asm) additionally disables inlines which we definitely don't want disabled
 * remove a large function which reserves memory without it ever being used *at*all* (from hci.*, mapdisplay.* and intelmap.c), also remove a function parameter from another function in mapdisplay.c, (it was this parameter that required the other functions to reserve memory)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@971 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 13:40:12 +00:00
Giel van Schijndel 9c79b6b109 ISO C 90 (or C-99 without GNU-extensions) compatibility fix:
* change all casts using the typeof() keyword to their respective typename
 * append a compiler flag for GCC (-fno-gnu-keywords) which disables GNU-specific keywords (typeof and asm only in case of C-99, inline as well if C-90 mode is used), to aid in code portability (i.e. among compilers)

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@970 4a71c877-e1ca-e34f-864e-861f7616d084
2007-01-08 12:42:51 +00:00
Dennis Schridde 067687c5e7 Fix raw Makefiles
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@937 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-28 11:47:58 +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 da3e52a447 Fix mime-types and rc file.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@874 4a71c877-e1ca-e34f-864e-861f7616d084
2006-12-01 22:02:14 +00:00
Dennis Schridde 6bc302b059 Don't use an .exe extension for Linux binaries in Makefile.raw builds. Patch by Christian Ohm.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@661 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-29 16:15:11 +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 d2ad2fc74e Improve Makefile.raw build slightly to support .rc files better.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@644 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-26 13:00:09 +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 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 9ac6649c35 Strip Makefile.raw build in release mode and add support for .rc files
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@519 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-04 14:59:36 +00:00
Dennis Schridde eaff16d04d Make MinGW compile a windows app instead of a console app. (Suggested by the MinGW docs. Probably got removed by me some time ago when redoing the Makefile.raw)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@513 4a71c877-e1ca-e34f-864e-861f7616d084
2006-08-01 19:00:21 +00:00
Dennis Schridde 26143d082c - More debug() calls
- Platform dependend LDFLAGS change for Makefile.raw


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@511 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-31 17:57:06 +00:00
Dennis Schridde 83046470f2 - Updated CHANGELOG
- Makefile.raw doesn't try to link every .o to GL on Linux anymore
- Fixed PhysicsFS ignorecase to not create a Doxygen mainpage


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@509 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-30 15:58:59 +00:00
Dennis Schridde 8e00128d68 Small typo fixes for Makefile.raw build system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@491 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-21 21:58:57 +00:00
Dennis Schridde 3116f462fc New Makefile.raw system, works with MinGW/Windows environment and Linux also.
Uses a config.mk.tmpl file to set system dependend stuff, no bash required.

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@490 4a71c877-e1ca-e34f-864e-861f7616d084
2006-07-21 21:48:55 +00:00
Rodolphe Suescun e36796f6ce Made necessary changes so that code can be compiled using g++.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@402 4a71c877-e1ca-e34f-864e-861f7616d084
2006-03-01 06:12:28 +00:00
Rodolphe Suescun d72f0cdc02 Fixed data directory problem.
Fixed sound source destruction problem.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@395 4a71c877-e1ca-e34f-864e-861f7616d084
2006-02-11 09:00:20 +00:00
Rodolphe Suescun d3629e24f9 Fixed various file loading/saving in windows version (related to
using PHYSFS_getDirSeparator() to build paths).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@367 4a71c877-e1ca-e34f-864e-861f7616d084
2005-12-01 20:22: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