19 Commits

Author SHA1 Message Date
Michael Werle
200902f9da Applied a (slightly tweaked) patchset sent in by Nicolas Boulenguez, the Debian maintainer of Oolite.
Changes consist of:
 - use #include instead of #import for C header files.
 - explicitly #include <assert.h> in various source files.
 - tweaks to build process for Debian.
 - deleted obsolete src/SDL/make* package building scripts.

"Works for me" - please check build process still works for you; esp. on Windows
.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4433 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-05 03:14:05 +00:00
Michael Werle
d915f5fde5 Makefiles - rework to accomodate new Javascript library
(Combined effort from Micha, Konstantinos, and Nikos)
 + removed support for building legacy libjs
 + (Linux only) now use the MacOS update script to auto-download the JS library
     - download script failure checks tweaked for older versions of bash
 + new Makefiles:
     - libjs.make - to download & build libjs (Linux only)
     - config.make - contains shared configuration variables between makefiles
 + debian packaging rules updated to suit



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4362 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-16 13:24:56 +00:00
Michael Werle
e80f7a1dcf Removed the bespoke apply-patches script for Debian; no longer required with new quilt-based package format.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3640 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-29 15:37:49 +00:00
Michael Werle
9ac5d02bed Revert the GNUmakefile to compile, by default, using system-dependecies. This makes it easier for developers rather than packagers. Associated changes to not break packaging build rules.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3448 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-02 19:14:29 +00:00
Michael Werle
949f8d2e36 * Fixed (?) broken build on Windows due to last commit.
* Included Makefile fix from Getafix to only use libespeak for Linux builds, not Windows.
* By default, (GNU)Makefile will now build using dependencies distributed in the Oolite repository
* Added new GNUMakefile switch (use_distro_deps=yes/no) to use locally installed header files and libraries


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3237 127b21dd-08f5-0310-b4b7-95ae10353056
2010-04-28 17:02:16 +00:00
Darren Salt
f7cdd77ca8 More cleanup fallout.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2814 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-30 19:49:34 +00:00
Jens Ayton
0aaa11f0e0 Fixed build breakages.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2813 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-30 19:10:55 +00:00
Jens Ayton
b3f7f8508a Tidying up in project directory.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2793 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-28 14:25:17 +00:00
Darren Salt
f687e6d385 Fix a .deb build bug which prevents successive builds without regenerating the executable.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2671 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-12 21:57:48 +00:00
Michael Werle
7d00c2cb77 Fix dh_lintian call for Ubuntu "hardy"
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2652 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-08 09:05:40 +00:00
Darren Salt
545437da88 Shut lintian up.
Alternatives: symlink the Resources dir, with the real dir being somewhere in /usr/share, but this causes upgrade problems (dpkg will not replace a directory with a symlink), or to symlink

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2646 127b21dd-08f5-0310-b4b7-95ae10353056
2009-10-07 19:26:44 +00:00
Michael Werle
28bc447fc5 Minor updates to the Debian man page and changelog and tweaked build rules slightly to include contributors.txt and not compress the OoliteRS.pdf file.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2359 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-03 06:36:25 +00:00
Jens Ayton
6aaf7a1e75 Committed unspeakable necromancy on the graveyard of the repository.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2331 127b21dd-08f5-0310-b4b7-95ae10353056
2009-08-29 23:09:22 +00:00
Jens Ayton
999fe7e969 Trying to convince svn that this deleted directory is really deleted.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2330 127b21dd-08f5-0310-b4b7-95ae10353056
2009-08-29 22:50:59 +00:00
Darren Salt
07ef0e42d6 Fix handling of oolite.dbg when building .debs with DEB_BUILD_OPTIONS=noopt.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2170 127b21dd-08f5-0310-b4b7-95ae10353056
2009-05-07 22:08:21 +00:00
Jens Ayton
886bfccbab Applied dsalt's libespeak patch. It doesn't work for me, but the build is fine if not built with make libespeak=yes so it doesn't hurt anything.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2091 127b21dd-08f5-0310-b4b7-95ae10353056
2009-03-15 16:14:03 +00:00
Michael Werle
ceb2b2e302 * Revamped build system - should make it a lot easier for people to build the sources and create packages
** Use "make -f Makefile help" to see a list of targets
** Updated Windows NSIS Packager rules
** Minor Tweaks to Debian rules

* Updated SpiderMonkey from 1.7 pre-release to 1.7 (minor changes only)
** Supplied new js32.dll for Windows (built with MSVC)

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1857 127b21dd-08f5-0310-b4b7-95ae10353056
2008-11-15 09:54:01 +00:00
Michael Werle
77703f89b6 Significant changes to the Debian build rules, largely copied from Darren
Salt's work from Bug #14126.

To build run 'debuild binary' in the root and to clean 'debuild clean'.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1837 127b21dd-08f5-0310-b4b7-95ae10353056
2008-11-07 01:12:48 +00:00
hikari
ba1c215ff6 Modifed Linux specific portions of the build rules.
Added Ubuntu/Debian build glue.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1029 127b21dd-08f5-0310-b4b7-95ae10353056
2007-06-11 17:24:23 +00:00