From 8a771ea7c4ef1c264a89c6458018209c4d206024 Mon Sep 17 00:00:00 2001 From: simon Date: Mon, 24 Jan 2005 15:45:37 +0000 Subject: [PATCH] Updates for OS X port (including updating copyright statements). git-svn-id: svn://svn.tartarus.org/sgt/puzzles@5201 cda61777-01e9-0310-a592-d414129be87e --- LICENCE | 2 +- README | 15 +++++++++++---- puzzles.but | 25 ++++++++++++++----------- 3 files changed, 26 insertions(+), 16 deletions(-) diff --git a/LICENCE b/LICENCE index a18a0b9..4b3c24e 100644 --- a/LICENCE +++ b/LICENCE @@ -1,4 +1,4 @@ -This software is copyright (c) 2004 Simon Tatham. +This software is copyright (c) 2004-2005 Simon Tatham. Portions copyright Richard Boulton. diff --git a/README b/README index deded6b..6b78774 100644 --- a/README +++ b/README @@ -14,7 +14,12 @@ You should find several Makefiles in the source code: tweaks and setting of TOOLPATH, it should work for both compiling on Windows and cross-compiling on Unix. -Each of these Makefiles builds a program called `nullgame' in + - `Makefile.osx' should work under Mac OS X, provided the Xcode + tools are installed. It builds a single monolithic OS X + application capable of running any of the puzzles, or even more + than one of them at a time. + +Many of these Makefiles build a program called `nullgame' in addition to the actual game binaries. This program doesn't do anything; it's just a template for people to start from when adding a new game to the collection, and it's compiled every time to ensure @@ -29,8 +34,10 @@ the Perl script `mkfiles.pl' from the file `Recipe'. If you need to change the makefiles as part of a patch, you should change Recipe and/or mkfiles.pl. -The manual, provided in Windows Help and text formats, is generated -from a Halibut source file (puzzles.but), which is the preferred form -for modification. To generate the manual in other formats, rebuild it, +The manual is provided in Windows Help format for the Windows build; +in text format for anyone who needs it; and in HTML for the Mac OS X +application and for the web site. It is generated from a Halibut +source file (puzzles.but), which is the preferred form for +modification. To generate the manual in other formats, rebuild it, or learn about Halibut, visit the Halibut website at . diff --git a/puzzles.but b/puzzles.but index 44081e3..be0a677 100644 --- a/puzzles.but +++ b/puzzles.but @@ -33,16 +33,17 @@ See \k{licence} for the licence text in full. I wrote this collection because I thought there should be more small desktop toys available: little games you can pop up in a window and play for two or three minutes while you take a break from whatever -else you were doing. And I was also annoyed that every time I found a -good game on (say) \i{Unix}, it wasn't available the next time I was -sitting at a \i{Windows} machine, or vice versa; so I arranged that -everything in my personal puzzle collection will happily run on both. -When I find (or perhaps invent) further puzzle games that I like, -they'll be added to this collection and will immediately be available -on both platforms. And if anyone feels like writing any other front -ends - Mac OS, PocketPC, or whatever it might be - then all the games -in this framework will immediately become available on another -platform as well. +else you were doing. And I was also annoyed that every time I found +a good game on (say) \i{Unix}, it wasn't available the next time I +was sitting at a \i{Windows} machine, or vice versa; so I arranged +that everything in my personal puzzle collection will happily run on +both, and have more recently done a port to Mac OS X as well. When I +find (or perhaps invent) further puzzle games that I like, they'll +be added to this collection and will immediately be available on +both platforms. And if anyone feels like writing any other front +ends - PocketPC, Mac OS pre-10, or whatever it might be - then all +the games in this framework will immediately become available on +another platform as well. The actual games in this collection were mostly not my invention; I saw them elsewhere, and rewrote them in a form that was more @@ -134,6 +135,8 @@ are specific to each game and are described in the following sections. \H{common-cmdline} Specifying game parameters on the \i{command line} +(This section does not apply to the Mac OS X version.) + The games in this collection deliberately do not ever save information on to the computer they run on: they have no high score tables and no saved preferences. (This is because I expect at least @@ -527,7 +530,7 @@ menu are \e{Width} and \e{Height}, which are self-explanatory. \A{licence} \I{MIT licence}\ii{Licence} -This software is \i{copyright} 2004 Simon Tatham. +This software is \i{copyright} 2004-2005 Simon Tatham. Portions copyright Richard Boulton. -- 2.11.0