From 3d577f70fb8a41a6609db76bdabae30f064a95bc Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 21 Nov 2009 16:46:17 +0000
Subject: Fix launch of game from setup tool.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1738
---
 src/setup/mode.c | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

(limited to 'src/setup')

diff --git a/src/setup/mode.c b/src/setup/mode.c
index ea90c76f..702db67d 100644
--- a/src/setup/mode.c
+++ b/src/setup/mode.c
@@ -162,16 +162,18 @@ void InitBindings(void)
 
 static void SetExecutable(mission_config_t *config)
 {
+    char *extension;
+
     free(executable);
 
 #ifdef _WIN32
-    executable = malloc(strlen(config->executable) + 5);
-    sprintf(executable, "%s.exe", config->executable);
+    extension = ".exe";
 #else
-    executable = malloc(strlen(INSTALL_DIR) + strlen(config->executable) + 2);
-    sprintf(executable, "%s%c%s", INSTALL_DIR, DIR_SEPARATOR,
-                                  config->executable);
+    extension = "";
 #endif
+
+    executable = malloc(strlen(config->executable) + 5);
+    sprintf(executable, "%s%s", config->executable, extension);
 }
 
 static void SetMission(mission_config_t *config)
-- 
cgit v1.2.3


From d0f41d4163fc96168f56155e6f5b36025eea79e4 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Sat, 21 Nov 2009 17:07:37 +0000
Subject: Make assembly name in setup-manifest.xml use PROGRAM_PREFIX. Remove
 INSTALL_DIR #define when building setup.

Subversion-branch: /branches/raven-branch
Subversion-revision: 1740
---
 src/setup/Makefile.am           | 3 +--
 src/setup/setup-manifest.xml.in | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

(limited to 'src/setup')

diff --git a/src/setup/Makefile.am b/src/setup/Makefile.am
index 58561b62..07d7c936 100644
--- a/src/setup/Makefile.am
+++ b/src/setup/Makefile.am
@@ -3,8 +3,7 @@ gamesdir = $(prefix)/games
 
 AM_CFLAGS = @SDL_CFLAGS@                                           \
             @SDLMIXER_CFLAGS@                                      \
-            -I$(top_builddir)/textscreen -I..                      \
-            -DINSTALL_DIR="\"$(gamesdir)\""
+            -I$(top_builddir)/textscreen -I..
 
 noinst_LIBRARIES = libsetup.a
 
diff --git a/src/setup/setup-manifest.xml.in b/src/setup/setup-manifest.xml.in
index 70ae915e..bac9a05e 100644
--- a/src/setup/setup-manifest.xml.in
+++ b/src/setup/setup-manifest.xml.in
@@ -3,7 +3,7 @@
   <!-- The "name" field in this tag should be the same as the executable's
        name -->
   <assemblyIdentity version="@PACKAGE_VERSION@.0" processorArchitecture="*"
-                    name="chocolate-setup" type="win32"/>
+                    name="@PROGRAM_PREFIX@setup" type="win32"/>
   <trustInfo xmlns="urn:schemas-microsoft-com:asm.v3">
     <security>
       <requestedPrivileges>
-- 
cgit v1.2.3