jepler/fruitjam-doom
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

osx: Remove GNUstep stuff.

Browse source 
This has never been officially supported and probably doesn't work
properly with the current .nib file. Let's just get rid of it.
This commit is contained in:
Simon Howard 2016-06-12 19:33:13 -04:00
parent fdb6b0f31f
commit 2bd688e2a6
5 changed files with 1 additions and 68 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
configure.ac
View file

@ -143,7 +143,6 @@ opl/examples/Makefile
pcsound/Makefile
pkg/Makefile
pkg/config.make
pkg/osx/Info-gnustep.plist
pkg/osx/Info.plist
rpm.spec
data/Makefile

2
pkg/Makefile.am
View file

@ -10,7 +10,7 @@ osx/Resources/launcher.nib/keyedobjects.nib \
osx/disk/dir.DS_Store \
osx/disk/background.png \
osx/GNUmakefile \
osx/Info.plist.in osx/Info-gnustep.plist.in \
osx/Info.plist.in \
osx/PkgInfo \
osx/cp-with-libs \
osx/dmgfix \

1
pkg/osx/.gitignore vendored
View file

@ -1,5 +1,4 @@
Info.plist
Info-gnustep.plist
launcher
*.o
*.d

29
pkg/osx/GNUmakefile
View file

@ -1,8 +1,4 @@
# Makefile for building the OS X launcher program and DMG package.
# It is also possible to build and run the launcher under Unix
# systems using GNUstep, although this is only here for development
# and debugging purposes.
include ../config.make
@ -16,8 +12,6 @@ DMG=$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).dmg
TOPLEVEL=../..
TOPLEVEL_DOCS=$(patsubst %,../../%,$(DOC_FILES))
ifndef GNUSTEP_MAKEFILES
# DMG file containing package:
$(DMG) : tmp.dmg
@ -32,27 +26,13 @@ tmp.dmg : $(STAGING_DIR)
-hfs-openfolder $(STAGING_DIR) $(STAGING_DIR) \
-o tmp.dmg
endif
# Staging dir build for package:
APP_DIR=$(STAGING_DIR)/$(PACKAGE_NAME).app
# OS X and GNUstep apps have a slightly different internal structure:
# OS X apps have their files within a containing "Contents" directory
# that does not exist in GNUstep apps. Similarly, the binaries are
# installed at the top level, rather than in a "MacOS" directory.
# Finally, we must install a different Info.plist file.
ifdef GNUSTEP_MAKEFILES
APP_TOP_DIR=$(APP_DIR)
APP_BIN_DIR=$(APP_DIR)
SRC_INFO_PLIST=Info-gnustep.plist
else
APP_TOP_DIR=$(APP_DIR)/Contents
APP_BIN_DIR=$(APP_DIR)/Contents/MacOS
SRC_INFO_PLIST=Info.plist
endif
APP_DOC_DIR=$(APP_BIN_DIR)/Documentation
APP_DOC_RELDIR=$(patsubst $(STAGING_DIR)/%,%,$(APP_DOC_DIR))
@ -110,17 +90,8 @@ clean : launcher_clean
rm -rf $(STAGING_DIR)
# Launcher build:
CFLAGS = -Wall -I$(TOPLEVEL)
# Are we building using gs_make?
ifdef GNUSTEP_MAKEFILES
CFLAGS += $(shell gnustep-config --objc-flags)
LDFLAGS = $(shell gnustep-config --gui-libs)
else
LDFLAGS = -framework Cocoa
endif
LAUNCHER_OBJS= \
AppController.o \

36
pkg/osx/Info-gnustep.plist.in
View file

@ -1,36 +0,0 @@
{
ApplicationName = "@PACKAGE_NAME@";
ApplicationDescription = "@PACKAGE_SHORTDESC@";
ApplicationIcon = app.png;
ApplicationRelease = @PACKAGE_VERSION@;
ApplicationURL = "@PACKAGE_URL@";
Authors = (
"@PACKAGE_MAINTAINER@ <@PACKAGE_BUGREPORT@>"
);
Copyright = "@PACKAGE_COPYRIGHT@";
CopyrightDescription = "@PACKAGE_LICENSE@";
FullVersionID = @PACKAGE_VERSION@;
GSMainMarkupFile = "";
NSExecutable = "launcher";
NSIcon = app.png;
NSMainNibFile = launcher.nib;
NSPrincipalClass = NSApplication;
NSRole = Application;
NSTypes = (
{
NSHumanReadableName = "Doom WAD file";
NSUnixExtensions = ( wad );
NSRole = Viewer;
NSMimeTypes = (
"application/x-doom"
);
NSIcon = "wadfile.png";
},
{
NSHumanReadableName = "Dehacked patch";
NSUnixExtensions = ( deh );
NSRole = Viewer;
NSIcon = "wadfile.png";
}
);
}