Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change base directory for Retro #60

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Change base directory for Retro #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd8cf5f
Change base directory for Retro
Mako88 Jun 13, 2015
e7ddf00
Change name of executable to d*x-retro
Mako88 Jun 14, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions d1/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion d1/main/inferno.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions d1/misc/physfsx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
6 changes: 3 additions & 3 deletions d2/SConstruct
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion d2/main/inferno.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
4 changes: 2 additions & 2 deletions d2/misc/physfsx.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down