ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Code cleanup to improve readability. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4995 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-02-02 23:21:19 +00:00
parent feba09f7a3
commit 05a998f777
2 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
SConstruct
View File

@ -242,37 +242,24 @@ if flavour == 'debug':
elif flavour == 'prof': elif flavour == 'prof':
extra = '-prof' extra = '-prof'
# TODO: support global install # Set up the install locations
if (ARGUMENTS.get('install') == 'global'): if (ARGUMENTS.get('install') == 'global'):
env['prefix'] = os.path.join(env['prefix'] + os.sep) env['prefix'] = os.path.join(env['prefix'] + os.sep)
else:
env['prefix'] = os.path.join(env['base_dir'] + 'Binary', platform.system() + '-' + platform.machine() + extra +os.sep)
#TODO add lib
if (ARGUMENTS.get('install') == 'global'):
env['plugin_dir'] = env['prefix'] + 'lib/dolphin-emu/'
else:
if sys.platform == 'darwin':
env['plugin_dir'] = env['prefix'] + 'Dolphin.app/Contents/PlugIns/'
else:
env['plugin_dir'] = env['prefix'] + 'Plugins/'
#TODO add bin
if (ARGUMENTS.get('install') == 'global'):
env['binary_dir'] = env['prefix'] + 'bin/' env['binary_dir'] = env['prefix'] + 'bin/'
else:
env['binary_dir'] = env['prefix']
#TODO add bin
if (ARGUMENTS.get('install') == 'global'):
env['libs_dir'] = env['prefix'] + 'lib/' env['libs_dir'] = env['prefix'] + 'lib/'
else: env['plugin_dir'] = env['prefix'] + 'lib/dolphin-emu/'
env['libs_dir'] = env['prefix'] + 'Libs/'
#TODO where should this go?
if (ARGUMENTS.get('install') == 'global'):
env['data_dir'] = env['prefix'] + "share/dolphin-emu/" env['data_dir'] = env['prefix'] + "share/dolphin-emu/"
else: else:
env['prefix'] = os.path.join(env['base_dir'] + 'Binary', platform.system() + '-' + platform.machine() + extra + os.sep)
env['binary_dir'] = env['prefix']
if sys.platform == 'darwin': if sys.platform == 'darwin':
env['plugin_dir'] = env['prefix'] + 'Dolphin.app/Contents/PlugIns/'
env['data_dir'] = env['prefix'] + 'Dolphin.app/Contents/' env['data_dir'] = env['prefix'] + 'Dolphin.app/Contents/'
env['libs_dir'] = env['prefix'] + 'Libs/'
else: else:
env['plugin_dir'] = env['prefix'] + 'plugins/'
env['data_dir'] = env['prefix'] env['data_dir'] = env['prefix']
env['libs_dir'] = env['prefix'] + 'lib/'
env['RPATH'].append(env['libs_dir']) env['RPATH'].append(env['libs_dir'])

70
Source/Core/Common/Src/CommonPaths.h
View File

@ -24,14 +24,14 @@
// Library suffix/prefix // Library suffix/prefix
#ifdef _WIN32 #ifdef _WIN32
#define PLUGIN_PREFIX "" #define PLUGIN_PREFIX ""
#define PLUGIN_SUFFIX ".dll" #define PLUGIN_SUFFIX ".dll"
#elif defined __APPLE__ #elif defined __APPLE__
#define PLUGIN_PREFIX "lib" #define PLUGIN_PREFIX "lib"
#define PLUGIN_SUFFIX ".dylib" #define PLUGIN_SUFFIX ".dylib"
#else #elif defined __linux__
#define PLUGIN_PREFIX "lib" #define PLUGIN_PREFIX "lib"
#define PLUGIN_SUFFIX ".so" #define PLUGIN_SUFFIX ".so"
#endif #endif
// Directory seperators, do we need this? // Directory seperators, do we need this?
@ -39,42 +39,48 @@
#define DIR_SEP_CHR '/' #define DIR_SEP_CHR '/'
// Location of the plugins // Location of the plugins
#ifdef LIBS_DIR #ifdef _WIN32
#define PLUGINS_DIR LIBS_DIR "dolphin-emu" #define PLUGINS_DIR "Plugins"
#elif defined __APPLE__ #elif defined __APPLE__
#define PLUGINS_DIR "Contents/PlugIns" #define PLUGINS_DIR "Contents/PlugIns"
#else #elif defined __linux__
#define PLUGINS_DIR "Plugins" #ifdef LIBS_DIR
#define PLUGINS_DIR LIBS_DIR "dolphin-emu"
#else
#define PLUGINS_DIR "plugins"
#endif
#endif #endif
// The user data dir // The user data dir
#define ROOT_DIR "." #define ROOT_DIR "."
#ifdef __linux__ #ifdef _WIN32
#define USERDATA_DIR "user" #define USERDATA_DIR "User"
#else #define DOLPHIN_DATA_DIR "Dolphin"
#define USERDATA_DIR "User"
#endif
#ifdef USER_DIR
#define DOLPHIN_DATA_DIR USER_DIR
#elif defined _WIN32
#define DOLPHIN_DATA_DIR "Dolphin"
#elif defined __APPLE__ #elif defined __APPLE__
#define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin" #define USERDATA_DIR "User"
#else #define DOLPHIN_DATA_DIR "Library/Application Support/Dolphin"
#define DOLPHIN_DATA_DIR ".dolphin" #elif defined __linux__
#define USERDATA_DIR "user"
#ifdef USER_DIR
#define DOLPHIN_DATA_DIR USER_DIR
#else
#define DOLPHIN_DATA_DIR ".dolphin"
#endif
#endif #endif
// Shared data dirs (Sys and shared User for linux) // Shared data dirs (Sys and shared User for linux)
#ifdef DATA_DIR #ifdef _WIN32
#define SYSDATA_DIR DATA_DIR "Sys" #define SYSDATA_DIR "Sys"
#define SHARED_USER_DIR DATA_DIR USERDATA_DIR DIR_SEP
#elif defined __APPLE__ #elif defined __APPLE__
#define SYSDATA_DIR "Contents/Sys" #define SYSDATA_DIR "Contents/Sys"
#elif defined __linux__ #elif defined __linux__
#define SYSDATA_DIR "sys" #ifdef DATA_DIR
#define SHARED_USER_DIR ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP #define SYSDATA_DIR DATA_DIR "sys"
#else #define SHARED_USER_DIR DATA_DIR USERDATA_DIR DIR_SEP
#define SYSDATA_DIR "Sys" #else
#define SYSDATA_DIR "sys"
#define SHARED_USER_DIR ROOT_DIR DIR_SEP USERDATA_DIR DIR_SEP
#endif
#endif #endif
// Dirs in both User and Sys // Dirs in both User and Sys