commit 2bd688e2a67b6c6970a0176a8f2b910676dc09fb
Author: Simon Howard <fraggle@soulsphere.org>
AuthorDate: Sun Jun 12 19:33:13 2016 -0400
Commit: Simon Howard <fraggle@soulsphere.org>
CommitDate: Sun Jun 12 19:33:13 2016 -0400
osx: Remove GNUstep stuff.
This has never been officially supported and probably doesn't work
properly with the current .nib file. Let's just get rid of it.
---
configure.ac | 1 -
pkg/Makefile.am | 2 +-
pkg/osx/.gitignore | 1 -
pkg/osx/GNUmakefile | 29 -----------------------------
pkg/osx/Info-gnustep.plist.in | 36 ------------------------------------
5 files changed, 1 insertion(+), 68 deletions(-)
diff --git a/configure.ac b/configure.ac
index 48450639..47cb3353 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/pkg/Makefile.am b/pkg/Makefile.am
index 32f5a699..428bae8c 100644
--- a/pkg/Makefile.am
+++ b/pkg/Makefile.am
@@ -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 \
diff --git a/pkg/osx/.gitignore b/pkg/osx/.gitignore
index ca1a7908..74b42f91 100644
--- a/pkg/osx/.gitignore
+++ b/pkg/osx/.gitignore
@@ -1,5 +1,4 @@
Info.plist
-Info-gnustep.plist
launcher
*.o
*.d
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index d966da39..e52c651d 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -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 \
diff --git a/pkg/osx/Info-gnustep.plist.in b/pkg/osx/Info-gnustep.plist.in
deleted file mode 100644
index da6675ba..00000000
--- a/pkg/osx/Info-gnustep.plist.in
+++ /dev/null
@@ -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";
- }
- );
-}