summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Howard2013-09-15 23:37:13 +0000
committerSimon Howard2013-09-15 23:37:13 +0000
commite4e5387b31550cd771b0ae77db18a2914a82688a (patch)
treee41b41b4491aa45479999d77fd828f41930841e1
parentd0874f317888f9a05fd6783c9c9466ce83b148ca (diff)
downloadchocolate-doom-e4e5387b31550cd771b0ae77db18a2914a82688a.tar.gz
chocolate-doom-e4e5387b31550cd771b0ae77db18a2914a82688a.tar.bz2
chocolate-doom-e4e5387b31550cd771b0ae77db18a2914a82688a.zip
Name OS X CMDLINE.game files as CMDLINE-game, so that they are not
considered as invalid file extensions. Subversion-branch: /branches/v2-branch Subversion-revision: 2656
-rw-r--r--pkg/osx/GNUmakefile7
-rw-r--r--pkg/osx/LauncherManager.m2
2 files changed, 5 insertions, 4 deletions
diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile
index 4a0da504..b998f77e 100644
--- a/pkg/osx/GNUmakefile
+++ b/pkg/osx/GNUmakefile
@@ -99,9 +99,10 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS)
mkdir -p "$(APP_BIN_DIR)/man/man5" "$(APP_BIN_DIR)/man/man6"
cp $(TOPLEVEL)/man/*.5 "$(APP_BIN_DIR)/man/man5"
cp $(TOPLEVEL)/man/*.6 "$(APP_BIN_DIR)/man/man6"
- cp $(TOPLEVEL)/man/CMDLINE.doom $(TOPLEVEL)/man/CMDLINE.heretic \
- $(TOPLEVEL)/man/CMDLINE.hexen $(TOPLEVEL)/man/CMDLINE.strife \
- "$(APP_DOC_DIR)"
+ for game in doom heretic hexen strife; do \
+ cp $(TOPLEVEL)/man/CMDLINE.$$game \
+ "$(APP_DOC_DIR)/CMDLINE-$$game"; \
+ done
cp disk/dir.DS_Store $(STAGING_DIR)/.DS_Store
cp disk/background.png $(STAGING_DIR)/background.png
diff --git a/pkg/osx/LauncherManager.m b/pkg/osx/LauncherManager.m
index 0f4028eb..dae2fa7c 100644
--- a/pkg/osx/LauncherManager.m
+++ b/pkg/osx/LauncherManager.m
@@ -362,7 +362,7 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName)
// selected game.
game_name = [self->iwadController getGameName];
- sprintf(filename, "CMDLINE.%s", game_name);
+ sprintf(filename, "CMDLINE-%s", game_name);
OpenDocumentation(filename);
}