From cd8cf5fc0def912b2d3966a6e048a28f92c915c3 Mon Sep 17 00:00:00 2001 From: John Ackerman Date: Sat, 13 Jun 2015 10:53:36 -0500 Subject: [PATCH 1/2] Change base directory for Retro --- d1/misc/physfsx.c | 4 ++-- d2/misc/physfsx.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/d1/misc/physfsx.c b/d1/misc/physfsx.c index 3702ec98..8d1376f1 100644 --- a/d1/misc/physfsx.c +++ b/d1/misc/physfsx.c @@ -61,9 +61,9 @@ void PHYSFSX_init(int argc, char *argv[]) #if defined(__unix__) # if !(defined(__APPLE__) && defined(__MACH__)) - path = "~/.d1x-rebirth/"; + path = "~/.d1x-retro/"; # else - path = "~/Library/Preferences/D1X Rebirth/"; + path = "~/Library/Preferences/D1X Retro/"; # endif if (path[0] == '~') // yes, this tilde can be put before non-unix paths. diff --git a/d2/misc/physfsx.c b/d2/misc/physfsx.c index 998f2d99..508938cb 100644 --- a/d2/misc/physfsx.c +++ b/d2/misc/physfsx.c @@ -61,9 +61,9 @@ void PHYSFSX_init(int argc, char *argv[]) #if defined(__unix__) # if !(defined(__APPLE__) && defined(__MACH__)) - path = "~/.d2x-rebirth/"; + path = "~/.d2x-retro/"; # else - path = "~/Library/Preferences/D2X Rebirth/"; + path = "~/Library/Preferences/D2X Retro/"; # endif if (path[0] == '~') // yes, this tilde can be put before non-unix paths. From e7ddf005c28c700e8505440516a0f95c4d580e72 Mon Sep 17 00:00:00 2001 From: John Ackerman Date: Sun, 14 Jun 2015 08:48:25 -0500 Subject: [PATCH 2/2] Change name of executable to d*x-retro --- d1/SConstruct | 4 ++-- d1/main/inferno.c | 2 +- d2/SConstruct | 6 +++--- d2/main/inferno.c | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/d1/SConstruct b/d1/SConstruct index 9561bc48..cd5146c1 100644 --- a/d1/SConstruct +++ b/d1/SConstruct @@ -390,8 +390,8 @@ class DXXProgram(DXXCommon): resources=[['English.lproj/InfoPlist.strings', 'English.lproj/InfoPlist.strings']]) class D1XProgram(DXXProgram): - PROGRAM_NAME = 'D1X-Rebirth' - target = 'd1x-rebirth' + PROGRAM_NAME = 'D1X-Retro' + target = 'd1x-retro' srcdir = '' ARGUMENTS = argumentIndirection('d1x') def prepare_environment(self): diff --git a/d1/main/inferno.c b/d1/main/inferno.c index d11c283d..0f338699 100644 --- a/d1/main/inferno.c +++ b/d1/main/inferno.c @@ -322,7 +322,7 @@ int main(int argc, char *argv[]) #define DXX_HOGFILE_NAMES "descent.hog" #if defined(__unix__) && !defined(__APPLE__) #define DXX_HOGFILE_PROGRAM_DATA_DIRECTORY \ - "\t$HOME/.d" DXX_NAME_NUMBER "x-rebirth\n" \ + "\t$HOME/.d" DXX_NAME_NUMBER "x-retro\n" \ "\t" SHAREPATH "\n" #else #define DXX_HOGFILE_PROGRAM_DATA_DIRECTORY \ diff --git a/d2/SConstruct b/d2/SConstruct index 6fa9e5b8..67f47ef4 100644 --- a/d2/SConstruct +++ b/d2/SConstruct @@ -396,8 +396,8 @@ class DXXProgram(DXXCommon): resources=[['English.lproj/InfoPlist.strings', 'English.lproj/InfoPlist.strings']]) class D2XProgram(DXXProgram): - PROGRAM_NAME = 'D2X-Rebirth' - target = 'd2x-rebirth' + PROGRAM_NAME = 'D2X-Retro' + target = 'd2x-retro' srcdir = '' ARGUMENTS = argumentIndirection('d2x') def prepare_environment(self): @@ -646,7 +646,7 @@ Help(program.PROGRAM_NAME + ', SConstruct file help:' + Extra options (add them to command line, like 'scons extraoption=value'): - 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/local/share/games/d2x-rebirth] + 'sharepath=[DIR]' (non-Mac OS *NIX only) use [DIR] for shared game data. [default: /usr/local/share/games/d2x-retro] 'opengl=[0/1]' build with OpenGL support [default: 1] 'opengles=[0/1]' build with OpenGL ES support [default: 0] 'opengles_lib=[NAME]' specify the name of the OpenGL ES library to link against diff --git a/d2/main/inferno.c b/d2/main/inferno.c index 2b7d40aa..664da078 100644 --- a/d2/main/inferno.c +++ b/d2/main/inferno.c @@ -334,7 +334,7 @@ int main(int argc, char *argv[]) #define DXX_HOGFILE_NAMES "descent2.hog or d2demo.hog" #if defined(__unix__) && !defined(__APPLE__) #define DXX_HOGFILE_PROGRAM_DATA_DIRECTORY \ - "\t$HOME/.d" DXX_NAME_NUMBER "x-rebirth\n" \ + "\t$HOME/.d" DXX_NAME_NUMBER "x-retro\n" \ "\t" SHAREPATH "\n" #else #define DXX_HOGFILE_PROGRAM_DATA_DIRECTORY \