From f176ac404ad709e6c1254f8685f8d9fe7b995115 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 15 Jan 2010 18:13:05 +0000 Subject: Extend osx makefile to allow building of a working GNUstep application, for testing purposes. Add GNUstep version of Info.plist, remove app-skeleton directory and move contents up. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1813 --- pkg/osx/Resources/128x128.png | Bin 0 -> 23029 bytes pkg/osx/Resources/app.icns | Bin 0 -> 51625 bytes pkg/osx/Resources/app.png | Bin 0 -> 4597 bytes pkg/osx/Resources/launcher.nib/classes.nib | 46 ++++++++++++++++++++++++ pkg/osx/Resources/launcher.nib/info.nib | 23 ++++++++++++ pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 0 -> 17541 bytes pkg/osx/Resources/wadfile.icns | Bin 0 -> 44092 bytes 7 files changed, 69 insertions(+) create mode 100644 pkg/osx/Resources/128x128.png create mode 100644 pkg/osx/Resources/app.icns create mode 100644 pkg/osx/Resources/app.png create mode 100644 pkg/osx/Resources/launcher.nib/classes.nib create mode 100644 pkg/osx/Resources/launcher.nib/info.nib create mode 100644 pkg/osx/Resources/launcher.nib/keyedobjects.nib create mode 100644 pkg/osx/Resources/wadfile.icns (limited to 'pkg/osx/Resources') diff --git a/pkg/osx/Resources/128x128.png b/pkg/osx/Resources/128x128.png new file mode 100644 index 00000000..0ef1fe9c Binary files /dev/null and b/pkg/osx/Resources/128x128.png differ diff --git a/pkg/osx/Resources/app.icns b/pkg/osx/Resources/app.icns new file mode 100644 index 00000000..9b535a25 Binary files /dev/null and b/pkg/osx/Resources/app.icns differ diff --git a/pkg/osx/Resources/app.png b/pkg/osx/Resources/app.png new file mode 100644 index 00000000..5b932e8c Binary files /dev/null and b/pkg/osx/Resources/app.png differ diff --git a/pkg/osx/Resources/launcher.nib/classes.nib b/pkg/osx/Resources/launcher.nib/classes.nib new file mode 100644 index 00000000..3ff47e71 --- /dev/null +++ b/pkg/osx/Resources/launcher.nib/classes.nib @@ -0,0 +1,46 @@ +{ + IBClasses = ( + { + CLASS = AppController; + LANGUAGE = ObjC; + OUTLETS = {launcherManager = id; }; + SUPERCLASS = NSObject; + }, + {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, + { + ACTIONS = {closeConfigWindow = id; openConfigWindow = id; }; + CLASS = IWADController; + LANGUAGE = ObjC; + OUTLETS = { + chex = id; + configWindow = id; + doom1 = id; + doom2 = id; + iwadSelector = id; + plutonia = id; + tnt = id; + }; + SUPERCLASS = NSObject; + }, + { + ACTIONS = {setButtonClicked = id; }; + CLASS = IWADLocation; + LANGUAGE = ObjC; + OUTLETS = {locationConfigBox = id; }; + SUPERCLASS = NSObject; + }, + { + ACTIONS = {launch = id; runSetup = id; }; + CLASS = LauncherManager; + LANGUAGE = ObjC; + OUTLETS = { + commandLineArguments = id; + iwadController = id; + launcherWindow = id; + packageLabel = id; + }; + SUPERCLASS = NSObject; + } + ); + IBVersion = 1; +} \ No newline at end of file diff --git a/pkg/osx/Resources/launcher.nib/info.nib b/pkg/osx/Resources/launcher.nib/info.nib new file mode 100644 index 00000000..aecf812a --- /dev/null +++ b/pkg/osx/Resources/launcher.nib/info.nib @@ -0,0 +1,23 @@ + + + + + IBDocumentLocation + 170 140 612 260 0 0 1440 878 + IBEditorPositions + + 29 + 108 337 163 44 0 0 1440 878 + + IBFramework Version + 446.1 + IBOpenObjects + + 21 + 29 + 227 + + IBSystem Version + 8S2167 + + diff --git a/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/pkg/osx/Resources/launcher.nib/keyedobjects.nib new file mode 100644 index 00000000..12cf6aa5 Binary files /dev/null and b/pkg/osx/Resources/launcher.nib/keyedobjects.nib differ diff --git a/pkg/osx/Resources/wadfile.icns b/pkg/osx/Resources/wadfile.icns new file mode 100644 index 00000000..13502a55 Binary files /dev/null and b/pkg/osx/Resources/wadfile.icns differ -- cgit v1.2.3 From 571b9c32f5e054f131abb9c1d0d68eb4c784a764 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 15 Jan 2010 18:40:37 +0000 Subject: Add wadfile.png for GNUstep build. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1814 --- pkg/osx/Resources/wadfile.png | Bin 0 -> 2249 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 pkg/osx/Resources/wadfile.png (limited to 'pkg/osx/Resources') diff --git a/pkg/osx/Resources/wadfile.png b/pkg/osx/Resources/wadfile.png new file mode 100644 index 00000000..394a3e33 Binary files /dev/null and b/pkg/osx/Resources/wadfile.png differ -- cgit v1.2.3 From bf8974e63b988ae1b5d2fdb0492dfe0bb3613680 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 23 Jan 2010 23:06:45 +0000 Subject: Add menu item to launcher to open a terminal window that can be used to start the game. Add missing 'edit' menu. Set svn:ignore property for osx directory. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1824 --- pkg/osx/Resources/launcher.nib/classes.nib | 2 +- pkg/osx/Resources/launcher.nib/info.nib | 6 +++--- pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 17541 -> 19494 bytes 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'pkg/osx/Resources') diff --git a/pkg/osx/Resources/launcher.nib/classes.nib b/pkg/osx/Resources/launcher.nib/classes.nib index 3ff47e71..236f6b67 100644 --- a/pkg/osx/Resources/launcher.nib/classes.nib +++ b/pkg/osx/Resources/launcher.nib/classes.nib @@ -30,7 +30,7 @@ SUPERCLASS = NSObject; }, { - ACTIONS = {launch = id; runSetup = id; }; + ACTIONS = {launch = id; openTerminal = id; runSetup = id; }; CLASS = LauncherManager; LANGUAGE = ObjC; OUTLETS = { diff --git a/pkg/osx/Resources/launcher.nib/info.nib b/pkg/osx/Resources/launcher.nib/info.nib index aecf812a..32b331f5 100644 --- a/pkg/osx/Resources/launcher.nib/info.nib +++ b/pkg/osx/Resources/launcher.nib/info.nib @@ -3,18 +3,18 @@ IBDocumentLocation - 170 140 612 260 0 0 1440 878 + 484 105 612 260 0 0 1440 878 IBEditorPositions 29 - 108 337 163 44 0 0 1440 878 + 221 322 205 44 0 0 1440 878 IBFramework Version 446.1 IBOpenObjects - 21 29 + 21 227 IBSystem Version diff --git a/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/pkg/osx/Resources/launcher.nib/keyedobjects.nib index 12cf6aa5..4f078d7c 100644 Binary files a/pkg/osx/Resources/launcher.nib/keyedobjects.nib and b/pkg/osx/Resources/launcher.nib/keyedobjects.nib differ -- cgit v1.2.3