Commit Graph

44 Commits (master)

Author SHA1 Message Date
KonstantinosSykas 4d0f37e956 Changed default target to 'help', updating
the relevant instructions to be more helpful. Minimized the 'debug' and
'deps-debug' targets priority when 'all' or 'deps-all' target is selected.
2020-09-09 17:23:58 +03:00
KonstantinosSykas d27428d52a Linux deps version bump
Static link to libjs by default
2019-06-09 13:17:15 +03:00
cim 622b05a990 As suggested in Debian patch, separate strip and debug options in build 2015-09-06 11:11:06 +01:00
KonstantinosSykas 138a627535 Update description for make target 'release'. 2015-06-04 15:09:43 +03:00
AnotherCommander d09a82c520 Windows installer: Refuse to run if the user tries to install the 64-bit version of the game on a 32-bit system. 2013-12-23 09:37:27 +01:00
AnotherCommander f0d45597e2 Added github hash to full version string (displayed also on watermark for snapshot builds). Corrected comment about hash digits shown. 2013-11-12 18:36:58 +01:00
AnotherCommander 47506d18e4 Reduce the length of the git hash going into the Windows installer filename to 7 characters instead of 10. 2013-11-10 22:55:06 +01:00
AnotherCommander 45b67a0d3b Update of Windows dependencies for x64 support step 1: Removal of old dependencies. 2013-10-31 09:06:57 +01:00
cim d2498d54df Adjust main Makefile now DebugOXP Makefile is gone 2013-10-17 22:16:26 +01:00
AnotherCommander 5609afe57b Git hash does not play well with version numbering as expected by the installer (X.X.X.X). Added git revision count to versioning of installer. The revision count is equivalent to the incremental SVN revision number and it should be a good way to track commits. 2013-09-09 13:10:38 +02:00
AnotherCommander 00d0612808 Added the first ten digits of the git revision hash to the version number stored in the installer files - note: git must be in the command path. 2013-09-09 11:00:39 +02:00
AnotherCommander 58f6cf2b70 Replace SVN revision number with build date in yymmdd format in Makefile. 2013-07-06 20:58:29 +02:00
Marc 3f010a5e0f Reinstated 'destructive' Makefile clean under windows.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4671 127b21dd-08f5-0310-b4b7-95ae10353056
2011-12-01 17:31:20 +00:00
Marc 6e06f5c94c In windows, 'make -f Makefile clean' now asks for confirmation before deleting the contents of oolite.app and the AddOns directory
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4670 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-30 00:05:17 +00:00
Marc 35f3a46c2c made 'make -f Makefile clean' less destructive under minGW, removed some redundant redundancy
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4669 127b21dd-08f5-0310-b4b7-95ae10353056
2011-11-29 20:20:51 +00:00
getafix 2544ec26dc Packager target added for new POSIX packager (r4492):
* pkg-posix-nightly   - builds a release self-extracting package


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4494 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-27 14:30:25 +00:00
getafix b386776e8b Added new packager for POSIX (e.g. FreeBSD, Linux etc.).
Stéphane Peter's makeself.sh script (http://megastep.org/makeself/) is
used to produce the installers/posix/oolite-<version>.x86[_64].run 
self-extractible package.

Packager targets added:
 * pkg-posix           - builds a release self-extracting package
 * pkg-posix-test      - builds a test release self-extracting package
 * pkg-posix-snapshot  - builds a snapshot release self-extracting package


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4492 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-26 13:58:16 +00:00
Nikos Barkas 0aef9f29fd Makefile now builds also Basic-debug.oxp on Windows and Linux systems. The Windows installer has now an additional page which allows the user to select whether to install Basic-debug.oxp or not. This page is available only in the test-release and test-release-snapshot configurations.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4489 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-25 00:19:12 +00:00
getafix 2d1aa63cd4 Makefile - fixed 'pkg-autopackage' build option (following r4431)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4470 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-13 09:06:27 +00:00
getafix 4bc17dc2e5 Makefile - on 'distclean', Javascript will also 'distclean' (following r4420)
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4434 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-05 06:51:29 +00:00
Michael Werle 36130bed1b Makefile improvements as suggested by Spooky on the BB to improve interoperability with other Unices (Patches provided).
(See http://aegidian.org/bb/viewtopic.php?f=5&t=9363)
 - change 'make' to '$(MAKE)' throughout
 - similar for other commands
 - Use '-u' switch for 'cp' only for Windows and GNU OSes.
 - convert GNUmakefile.postamble from DOS to Unix file-endings

git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4431 127b21dd-08f5-0310-b4b7-95ae10353056
2011-03-04 19:21:17 +00:00
Michael Werle cbce376119 Major Wormhole fixing.
* Mainly the fix for interstellar wormholes: http://aegidian.org/bb/viewtopic.php?f=3&t=9283
** Wormholes now use coordinates rather than seeds for their origin and destination (extra keys in savegame)
* Also various other fixes for ships following the player ship
** Escorts of ships following the player now also follow
** Escorts can't overtake their mother into the wormhole
* Some code refactoring:
** All ships now enter wormholes through [ShipEntity enterWormhole] instead of variously calling [WormholeEntity suckInShip:]
** Removed the static wormhole in ShipEntityAI.m

Unrelated:
* Makefile - only clean Javascript on 'distclean', not on 'clean'.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4420 127b21dd-08f5-0310-b4b7-95ae10353056
2011-02-27 23:29:34 +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
Nikos Barkas 62579128ca Removal of old JavaScript from the Windows port.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4200 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-30 18:58:14 +00:00
getafix 4ae2559403 Detach Linux <make clean> from deps/Cross-platform-deps/SpiderMonkey too.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4181 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-29 18:32:29 +00:00
getafix 16077685a5 Detach Linux builds from using /deps/Cross-platform-deps/SpiderMonkey source.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@4179 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-29 18:17:47 +00:00
getafix 05fc6fd088 Switched Linux nightly 32bit build to the new JavaScript engine
for testing purposes:
* A pre-built library is temporarily used at this phase.
* Method JIT (JaegerMonkey) is supported.
* Only deps-release-snapshot Oolite build mode should be affected.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3983 127b21dd-08f5-0310-b4b7-95ae10353056
2011-01-03 21:50:00 +00:00
Michael Werle 01322db4ee + Add JS_OPT=yes/no command-line parameter to (GNU)Makefile. Determines whether to compile/link with Optimised or Debug version of Spidermonkey. (Default optimised)
+ Disable NSOperation for GNUstep builds for now.  Current GNUstep (up to trunk) only has an incomplete implementation of it.



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3478 127b21dd-08f5-0310-b4b7-95ae10353056
2010-06-06 22:05:16 +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
Nikos Barkas 234834f712 Better espeak import library linker semantics. Removed now obsolete libespeak=yes setting from Makefile. espeak-data folder is copied in installation image under Windows only when building with eSpeak support.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3276 127b21dd-08f5-0310-b4b7-95ae10353056
2010-05-03 07:11:56 +00:00
Nikos Barkas 39bf0354e5 Added eSpeak support for the Windows builds. Moved espeak-data folder to cross platform dependencies. Updated default.apspec files with new location of espeak-data.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3268 127b21dd-08f5-0310-b4b7-95ae10353056
2010-05-02 16:49:54 +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
Michael Werle 970d597b71 Fix GNUmakefile for standard Debian builds.
NOTE: This fix may break the linux binary package build.  Check out the new 'getafix' section to see how this might be fixed.  It may require additional targets in the Makefile.


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3236 127b21dd-08f5-0310-b4b7-95ae10353056
2010-04-28 15:36:17 +00:00
getafix de60dba4e3 Transparent linux-x86, linux-x86_64 build and autopackage-packaging with
new Linux-deps folder (ready for distro independent build) and 
updated Makefile, GNUmakefile and autopackage apspec files

Speech support with eSpeak compiled using PulseAudio instead of the default PortAudio.
(Smoother inter-distro speech execution when eSpeak does not use PortAudio)

Fixed oolite-update to include itself during updates

Fixed oolite wrapper-scripts not passing command line arguments to oolite executable

Updated Linux README.TXT, PLAYING.TXT files

Dependency libraries updates:
   gnustep-base-1.18 - VSync issue addressed (noticed on nVidia cards). Fixed the tearing issue enabling smooth video scrolling.
   SDL-1.2.14
   libpng14
   eSpeak-1.43.03 - Supports klat voices

Deleted Linux-x86-deps/
Deleted installers/autopackage/default.apspec



git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@3233 127b21dd-08f5-0310-b4b7-95ae10353056
2010-04-28 09:37:38 +00:00
getafix 4e1681aedd Updated default.apspec and Makefile, to comply with revision 2793 folder cleanup.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2848 127b21dd-08f5-0310-b4b7-95ae10353056
2009-12-06 02:28:47 +00:00
Nikos Barkas e1c1924e9e Build configuration changes to align the SDL builds with the Mac equivalents. Added the pkg-win-deployment configuration for stable releases. The deployment settings are forced, while the test release ones are adjustable. Tested successfully on Windows for the test releae, deployment, snapshot and debug configurations. Linux testing still needed.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2746 127b21dd-08f5-0310-b4b7-95ae10353056
2009-11-14 16:18:23 +00:00
Michael Werle c7bd78d83a Minor tweaks to automated Debian version numbering from 1.73-maintenace.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2460 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-09 21:43:07 +00:00
Michael Werle d7ed9045cf Automatic Debian version numbering
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2384 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-05 09:40:57 +00:00
Michael Werle 2eb7f0e45b Bugfix to autopackage, and added a target to the Makefile.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2380 127b21dd-08f5-0310-b4b7-95ae10353056
2009-09-04 16:44:01 +00:00
Nikos Barkas 722b229202 Added watermark text for the snapshot versions. Currently working on Windows. The idea is to use the snapshot releases for things like nightly builds or distributions of the game other than the official ones. Updated the readme of the Windows version to reflect current project situation.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@2234 127b21dd-08f5-0310-b4b7-95ae10353056
2009-07-11 16:09:53 +00:00
Michael Werle a68999c901 Windows Installer - now extracts Oolite Version number from oolite-version.xcconfig (thanks Ahruman), taking into account X.Y and X.Y.Z version numbers.
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1867 127b21dd-08f5-0310-b4b7-95ae10353056
2008-11-17 19:04:27 +00:00
Michael Werle 0011b8ca9a Windows Installer
* Merged Snapshot and Standard packaging scripts (and removed superfluous installer scripts)
* Detect previously installed versions of Oolite and prompt for uninstall
* Removed 2 DLLs which don't appear to be required anymore
* Add some additional version numbering and description to the packaged executable

Makefile
* Auto-generate version information for Windows Installer
* TODO: auto-extract Oolite version from Info-Oolite.plist


git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1866 127b21dd-08f5-0310-b4b7-95ae10353056
2008-11-17 10:42:14 +00:00
Nikos Barkas 0a1117ba8e Replace SDL.dll with a stripped version for distribution. Upgrade the installer script to modern interface and add confirmation dialog for the uninstaller. Remove DTDs installation for the Windows build, since the gnustep-base-1_15.dll is already built to not require them. Tweak a little the installer so that it does not fail with some versions of NSIS (such as mine ;-) ).
git-svn-id: http://svn.berlios.de/svnroot/repos/oolite-linux/trunk@1859 127b21dd-08f5-0310-b4b7-95ae10353056
2008-11-15 14:21:56 +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