From 2c6e7b2f10c32ca0406ca6753e7701d83e6dea8f Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 21 Nov 2009 03:56:59 +0000 Subject: Add Makefile to build Win32 packages. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1736 --- pkg/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/Makefile.am') diff --git a/pkg/Makefile.am b/pkg/Makefile.am index 00ab5d6f..66cb9ba0 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -1,3 +1,3 @@ -DIST_SUBDIRS=wince +DIST_SUBDIRS=wince win32 -- cgit v1.2.3 From 860a17497bdc189f78f5a0bca000a0451d5ae624 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 5 Jan 2010 15:52:12 +0000 Subject: Move config.make up to pkg/ directory. Use static makefiles to generate all packages, rather than dynamically generated makefiles. Add pkg/osx to dist. Make OS X staging directory depend on top level documentation files. Generate CMDLINE as part of standard build if it is not already present. Set svn:ignore properties. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1790 --- pkg/Makefile.am | 28 +++++++++++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) (limited to 'pkg/Makefile.am') diff --git a/pkg/Makefile.am b/pkg/Makefile.am index 66cb9ba0..9a607ee8 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -1,3 +1,29 @@ -DIST_SUBDIRS=wince win32 +OSX_FILES= \ +osx/app-skeleton/Contents/PkgInfo \ +osx/app-skeleton/Contents/Resources/128x128.png \ +osx/app-skeleton/Contents/Resources/app.icns \ +osx/app-skeleton/Contents/Resources/launcher.nib/classes.nib \ +osx/app-skeleton/Contents/Resources/launcher.nib/info.nib \ +osx/app-skeleton/Contents/Resources/launcher.nib/keyedobjects.nib \ +osx/GNUmakefile \ +osx/Info.plist.in \ +osx/cp-with-libs \ +osx/main.m \ +osx/AppController.m osx/AppController.h \ +osx/Execute.m osx/Execute.h \ +osx/IWADController.m osx/IWADController.h \ +osx/IWADLocation.m osx/IWADLocation.h \ +osx/LauncherManager.m osx/LauncherManager.h + +WINCE_FILES= \ +wince/GNUmakefile \ +wince/wince-cab.cfg \ +wince/wince-cabgen + +WIN32_FILES= \ +win32/GNUmakefile \ +win32/README + +EXTRA_DIST=$(OSX_FILES) $(WINCE_FILES) $(WIN32_FILES) -- cgit v1.2.3 From 96fc229a12f020a3c51cca8ea1c88887200a2621 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Tue, 12 Jan 2010 01:20:48 +0000 Subject: Add document icon file and use for file associations. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1804 --- pkg/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'pkg/Makefile.am') diff --git a/pkg/Makefile.am b/pkg/Makefile.am index 9a607ee8..b898e728 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -3,6 +3,7 @@ OSX_FILES= \ osx/app-skeleton/Contents/PkgInfo \ osx/app-skeleton/Contents/Resources/128x128.png \ osx/app-skeleton/Contents/Resources/app.icns \ +osx/app-skeleton/Contents/Resources/wadfile.icns \ osx/app-skeleton/Contents/Resources/launcher.nib/classes.nib \ osx/app-skeleton/Contents/Resources/launcher.nib/info.nib \ osx/app-skeleton/Contents/Resources/launcher.nib/keyedobjects.nib \ -- cgit v1.2.3 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/Makefile.am | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'pkg/Makefile.am') diff --git a/pkg/Makefile.am b/pkg/Makefile.am index b898e728..6a3b38ff 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -1,14 +1,15 @@ OSX_FILES= \ -osx/app-skeleton/Contents/PkgInfo \ -osx/app-skeleton/Contents/Resources/128x128.png \ -osx/app-skeleton/Contents/Resources/app.icns \ -osx/app-skeleton/Contents/Resources/wadfile.icns \ -osx/app-skeleton/Contents/Resources/launcher.nib/classes.nib \ -osx/app-skeleton/Contents/Resources/launcher.nib/info.nib \ -osx/app-skeleton/Contents/Resources/launcher.nib/keyedobjects.nib \ +osx/Resources/128x128.png \ +osx/Resources/app.icns \ +osx/Resources/app.png \ +osx/Resources/wadfile.icns \ +osx/Resources/launcher.nib/classes.nib \ +osx/Resources/launcher.nib/info.nib \ +osx/Resources/launcher.nib/keyedobjects.nib \ osx/GNUmakefile \ -osx/Info.plist.in \ +osx/Info.plist.in osx/Info-GNUstep.plist.in \ +osx/PkgInfo \ osx/cp-with-libs \ osx/main.m \ osx/AppController.m osx/AppController.h \ -- 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/Makefile.am | 1 + 1 file changed, 1 insertion(+) (limited to 'pkg/Makefile.am') diff --git a/pkg/Makefile.am b/pkg/Makefile.am index 6a3b38ff..75520fbd 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -4,6 +4,7 @@ osx/Resources/128x128.png \ osx/Resources/app.icns \ osx/Resources/app.png \ osx/Resources/wadfile.icns \ +osx/Resources/wadfile.png \ osx/Resources/launcher.nib/classes.nib \ osx/Resources/launcher.nib/info.nib \ osx/Resources/launcher.nib/keyedobjects.nib \ -- cgit v1.2.3 From 893c8dbe922b5ee6ac14c3df3b5020817b6797b3 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 15 Jan 2010 19:14:02 +0000 Subject: Fix GNUstep info panel. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1816 --- pkg/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkg/Makefile.am') diff --git a/pkg/Makefile.am b/pkg/Makefile.am index 75520fbd..9775fa77 100644 --- a/pkg/Makefile.am +++ b/pkg/Makefile.am @@ -9,7 +9,7 @@ osx/Resources/launcher.nib/classes.nib \ osx/Resources/launcher.nib/info.nib \ osx/Resources/launcher.nib/keyedobjects.nib \ osx/GNUmakefile \ -osx/Info.plist.in osx/Info-GNUstep.plist.in \ +osx/Info.plist.in osx/Info-gnustep.plist.in \ osx/PkgInfo \ osx/cp-with-libs \ osx/main.m \ -- cgit v1.2.3