Commit Graph

66 Commits (c29df7dae5d3aa0fca7cc0fb3ac74946ed0246c1)

Author SHA1 Message Date
Giel van Schijndel 55d0221158 make *.lex.h depend on the FLEX rule as well for the raw Makefile system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5029 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 21:28:06 +00:00
Giel van Schijndel 73be5e4b4d Add BUILT_SOURCES and CLEANFILES to the raw Makefile system as well (similar to the vars with the same name in automake)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@5028 4a71c877-e1ca-e34f-864e-861f7616d084
2008-05-10 21:13:14 +00:00
Giel van Schijndel 0f71381685 Lets use some proper make rules!
* Use $@ and $< to refer to the targets and dependencies of make rules
 * Don't refer to make rule dependencies and targets by copying them!
 * Putting make rules on multiple lines isn't bad, in fact it increases readability!
 * Mark phony make rules (i.e. rules who's actions don't produce files) as `.PHONY`

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4846 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 20:58:13 +00:00
Giel van Schijndel a5a74770e8 Allow proper linking of the exceptionhandler with the raw Makefile system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4845 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-28 20:46:33 +00:00
Giel van Schijndel fdcadfcc8f Compile & link in Dr. MinGW's exceptionhandler
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4490 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 16:15:14 +00:00
Giel van Schijndel 465d5d73fe Use $(CPPFLAGS) as well when compiling with the raw makefile system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@4488 4a71c877-e1ca-e34f-864e-861f7616d084
2008-04-05 15:58:25 +00:00
Dennis Schridde bf93d41317 It's libGLC in the devpkg, not libglc32... Perhaps that's a mistake in OpenGLC's buildscripts...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3495 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 23:26:13 +00:00
Dennis Schridde 72419616fa Link against libpng12, so the libpng12.a symlink issue in the devpkg is not anymore noticed. (People having moved their libpng12.a should move it back...)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3493 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 22:39:23 +00:00
Dennis Schridde fc384c7c44 Apparently Make doesn't expand CFLAGS in CXXFLAGS+=$(CFLAGS), so duplicate the line instead...
Also use GNU99 instead of C99 and CXX for .cpp files.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3489 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 19:35:04 +00:00
Dennis Schridde d1f744e97c Move c99 out of cxxflags...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3488 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 19:23:31 +00:00
Dennis Schridde 97244be45d Properly define C(XX)FLAGS instead of modifying Make rules.
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3487 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 19:16:02 +00:00
Giel van Schijndel 70b196b017 * Only use -Werror-implicit-function-declaration when compiling C code (not when compiling C++)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3486 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 19:02:26 +00:00
Giel van Schijndel 238aa3e9e4 * Compile C files as C99 with the raw Makefile system
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3485 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-15 18:23:48 +00:00
Dennis Schridde bbbd4942fe Move the deps of our deps to the right of our deps...
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3419 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 20:51:48 +00:00
Dennis Schridde e7ed93d5f9 - Move libraries to satisfy our dep's deps out of the PLATFORM choice, since they would be the same for windows and mingw32.
- Link against GLC instead of glc32 for windows, since that is what the devpkg contains.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3418 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 20:26:29 +00:00
Dennis Schridde f6a9f7c864 - Link against all required libs for PLATFORM=windows (How shall mingw32 be treated? Does make's syntax allow an OR? Then we could unify them again...)
- Remove -L. for mingw32, since libdbghelp.a is now included in the devpkg.


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3417 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-09 20:23:23 +00:00
Dennis Schridde ca607873eb Correct include paths for Makefile.raw:
- Include include/ after any other dir
- Add include/libpng12 to the paths


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3414 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-08 23:01:54 +00:00
Giel van Schijndel d135ff55a0 * Update the raw Makefile config.mk template
* Don't comment out the defaults as they're quite sane
  * Use C:/devpkg as the default DEVDIR
  * Add a comment above the stuff that's only needed for distributors

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3385 4a71c877-e1ca-e34f-864e-861f7616d084
2008-01-06 16:10:08 +00:00
Giel van Schijndel 06f01e129a * #Define PACKAGE_VERSION instead of VERSION in the raw Makefiles (synonymous to r3125 which was for the Code::Blocks project file)
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@3141 4a71c877-e1ca-e34f-864e-861f7616d084
2007-12-23 19:58:20 +00:00
Dennis Schridde 9cc0a628c1 Do parts of the proposed changes in "[Warzone-dev] build issues in FreeBSD system" by Yaroslav Kolomiyets from 24.10.2006:
- SDL header includes don't use SDL/ anymore (raw Makefiles and MSVC Project adapted).


git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2863 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-24 11:49:51 +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
Giel van Schijndel 59c1b8fc11 * Add AutoRevision to raw makefile system
* Set raw makefiles up to use AutoRevision to generate src/autorevision.h

git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2722 4a71c877-e1ca-e34f-864e-861f7616d084
2007-11-05 02:29:46 +00:00
Giel van Schijndel ac6069f791 * Make sure the raw Makefiles link against GLC
git-svn-id: svn+ssh://svn.gna.org/svn/warzone/trunk@2543 4a71c877-e1ca-e34f-864e-861f7616d084
2007-10-11 22:55:34 +00:00
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