From a054475997a14499a9bce528a64efb22ce2fe2b0 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 30 Jan 2010 16:04:24 +0000 Subject: Set launch button as default button, so that it is possible to launch the game by pressing return. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1834 --- pkg/osx/LauncherManager.h | 1 + pkg/osx/LauncherManager.m | 1 + pkg/osx/Resources/launcher.nib/classes.nib | 1 + pkg/osx/Resources/launcher.nib/info.nib | 2 +- pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 19494 -> 19616 bytes 5 files changed, 4 insertions(+), 1 deletion(-) (limited to 'pkg') diff --git a/pkg/osx/LauncherManager.h b/pkg/osx/LauncherManager.h index 76c74624..e454ab4f 100644 --- a/pkg/osx/LauncherManager.h +++ b/pkg/osx/LauncherManager.h @@ -32,6 +32,7 @@ IWADController *iwadController; id launcherWindow; + id launchButton; id commandLineArguments; id packageLabel; diff --git a/pkg/osx/LauncherManager.m b/pkg/osx/LauncherManager.m index ee7ed3dc..ae91ef4d 100644 --- a/pkg/osx/LauncherManager.m +++ b/pkg/osx/LauncherManager.m @@ -330,6 +330,7 @@ static NSString *AppendQuotedFilename(NSString *str, NSString *fileName) [self->packageLabel setStringValue: @PACKAGE_STRING]; [self->launcherWindow setTitle: @PACKAGE_NAME " Launcher"]; [self->launcherWindow center]; + [self->launcherWindow setDefaultButtonCell: [self->launchButton cell]]; [self setConfig]; } diff --git a/pkg/osx/Resources/launcher.nib/classes.nib b/pkg/osx/Resources/launcher.nib/classes.nib index 236f6b67..7efc837a 100644 --- a/pkg/osx/Resources/launcher.nib/classes.nib +++ b/pkg/osx/Resources/launcher.nib/classes.nib @@ -36,6 +36,7 @@ OUTLETS = { commandLineArguments = id; iwadController = id; + launchButton = id; launcherWindow = id; packageLabel = id; }; diff --git a/pkg/osx/Resources/launcher.nib/info.nib b/pkg/osx/Resources/launcher.nib/info.nib index 32b331f5..512ee6dd 100644 --- a/pkg/osx/Resources/launcher.nib/info.nib +++ b/pkg/osx/Resources/launcher.nib/info.nib @@ -3,7 +3,7 @@ IBDocumentLocation - 484 105 612 260 0 0 1440 878 + 325 73 612 260 0 0 1440 878 IBEditorPositions 29 diff --git a/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/pkg/osx/Resources/launcher.nib/keyedobjects.nib index 4f078d7c..cc763056 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 From fdcd8dda0935403185ba307304028d3a682297a9 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Sat, 30 Jan 2010 16:14:04 +0000 Subject: Change directory to home directory before launching the game, so that recorded demos go somewhere sensible. Subversion-branch: /trunk/chocolate-doom Subversion-revision: 1835 --- pkg/osx/Execute.m | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'pkg') diff --git a/pkg/osx/Execute.m b/pkg/osx/Execute.m index bb4eed45..608443e2 100644 --- a/pkg/osx/Execute.m +++ b/pkg/osx/Execute.m @@ -100,6 +100,7 @@ static void DoExec(const char *executable, const char *iwad, const char *args) void ExecuteProgram(const char *executable, const char *iwad, const char *args) { pid_t childpid; + char *homedir; childpid = fork(); @@ -107,6 +108,16 @@ void ExecuteProgram(const char *executable, const char *iwad, const char *args) { signal(SIGCHLD, SIG_DFL); + // Change directory to home dir before launch, so that any demos + // are saved somewhere sensible. + + homedir = getenv("HOME"); + + if (homedir != NULL) + { + chdir(homedir); + } + DoExec(executable, iwad, args); } else -- cgit v1.2.3 From 3c18831a7ce351d6163fccff8d8813537f27f778 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 5 Feb 2010 23:23:48 +0000 Subject: Rearrange Makefile definitions. Subversion-branch: /branches/raven-branch Subversion-revision: 1846 --- pkg/wince/GNUmakefile | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'pkg') diff --git a/pkg/wince/GNUmakefile b/pkg/wince/GNUmakefile index 82b1f1e3..3b8171aa 100644 --- a/pkg/wince/GNUmakefile +++ b/pkg/wince/GNUmakefile @@ -1,35 +1,35 @@ include ../config.make -all: $(DOOM_CAB) $(HERETIC_CAB) $(HEXEN_CAB) - -clean: - rm -f $(DOOM_CAB) $(HERETIC_CAB) $(HEXEN_CAB) - # Doom: DOOM_CAB=$(PROGRAM_PREFIX)doom-$(PACKAGE_VERSION).cab DOOM_CFG=doom-cab.cfg DOOM_DEPS=$(shell ./wince-cabgen -d $(DOOM_CFG)) -$(DOOM_CAB) : $(DOOM_CFG) $(DOOM_DEPS) - ./wince-cabgen $< $@ - # Heretic: HERETIC_CAB=$(PROGRAM_PREFIX)heretic-$(PACKAGE_VERSION).cab HERETIC_CFG=heretic-cab.cfg HERETIC_DEPS=$(shell ./wince-cabgen -d $(HERETIC_CFG)) -$(HERETIC_CAB) : $(HERETIC_CFG) $(HERETIC_DEPS) - ./wince-cabgen $< $@ - # Hexen: HEXEN_CAB=$(PROGRAM_PREFIX)hexen-$(PACKAGE_VERSION).cab HEXEN_CFG=hexen-cab.cfg HEXEN_DEPS=$(shell ./wince-cabgen -d $(HEXEN_CFG)) +all: $(DOOM_CAB) $(HERETIC_CAB) $(HEXEN_CAB) + +$(DOOM_CAB) : $(DOOM_CFG) $(DOOM_DEPS) + ./wince-cabgen $< $@ + +$(HERETIC_CAB) : $(HERETIC_CFG) $(HERETIC_DEPS) + ./wince-cabgen $< $@ + $(HEXEN_CAB) : $(HEXEN_CFG) $(HEXEN_DEPS) ./wince-cabgen $< $@ +clean: + rm -f $(DOOM_CAB) $(HERETIC_CAB) $(HEXEN_CAB) + -- cgit v1.2.3 From 52f81b4ef175358d1e1f7f9eecab2a1edb7f4b65 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Fri, 5 Feb 2010 23:30:22 +0000 Subject: Update OS X Makefile to include Heretic and Hexen executables, and to correct the setup location. Subversion-branch: /branches/raven-branch Subversion-revision: 1847 --- pkg/osx/GNUmakefile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'pkg') diff --git a/pkg/osx/GNUmakefile b/pkg/osx/GNUmakefile index d119efa1..a0f6151f 100644 --- a/pkg/osx/GNUmakefile +++ b/pkg/osx/GNUmakefile @@ -58,10 +58,14 @@ $(STAGING_DIR): launcher $(TOPLEVEL_DOCS) cp launcher "$(APP_BIN_DIR)" $(STRIP) "$(APP_BIN_DIR)/launcher" - ./cp-with-libs $(TOPLEVEL)/src/$(PACKAGE_TARNAME) "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/$(PACKAGE_TARNAME)" - ./cp-with-libs $(TOPLEVEL)/setup/chocolate-setup "$(APP_BIN_DIR)" - $(STRIP) "$(APP_BIN_DIR)/chocolate-setup" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)doom "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)doom" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)heretic "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)heretic" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)hexen "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)hexen" + ./cp-with-libs $(TOPLEVEL)/src/$(PROGRAM_PREFIX)setup "$(APP_BIN_DIR)" + $(STRIP) "$(APP_BIN_DIR)/$(PROGRAM_PREFIX)setup" find $(STAGING_DIR) -name .svn -delete -exec rm -rf {} \; || true -- cgit v1.2.3