diff --git a/Externals/MemcardManager/SConscript b/Externals/MemcardManager/SConscript index afa8309ade..394437b8a9 100644 --- a/Externals/MemcardManager/SConscript +++ b/Externals/MemcardManager/SConscript @@ -17,4 +17,4 @@ libs = [ exeGUI = env['binary_dir'] + 'MemcardManager' -env.Program('#' + exeGUI, files, LIBS = env['LIBS'] + libs) +env.Program(exeGUI, files, LIBS = env['LIBS'] + libs) diff --git a/SConstruct b/SConstruct index 92dec97abb..fa116a8aeb 100644 --- a/SConstruct +++ b/SConstruct @@ -223,7 +223,7 @@ if sys.platform == 'linux2' and env['install'] == 'global': env['plugin_dir'] = env['prefix'] + 'lib/dolphin-emu/' env['data_dir'] = env['prefix'] + "share/dolphin-emu/" else: - env['prefix'] = os.path.join('Binary', + env['prefix'] = os.path.join('#Binary', platform.system() + '-' + platform.machine() + extra + os.sep) env['binary_dir'] = env['prefix'] env['plugin_dir'] = env['prefix'] + 'plugins/' @@ -458,8 +458,8 @@ if sys.platform == 'darwin': env.Install('#' + env['data_dir'], 'Data/Sys') env.Install('#' + env['data_dir'], 'Data/User') else: - env.InstallAs('#' + env['data_dir'] + 'sys', 'Data/Sys') - env.InstallAs('#' + env['data_dir'] + 'user', 'Data/User') + env.InstallAs(env['data_dir'] + 'sys', 'Data/Sys') + env.InstallAs(env['data_dir'] + 'user', 'Data/User') env.Alias('install', env['prefix']) diff --git a/Source/Core/DolphinWX/Src/SConscript b/Source/Core/DolphinWX/Src/SConscript index 82950fe46c..d70347d4c7 100644 --- a/Source/Core/DolphinWX/Src/SConscript +++ b/Source/Core/DolphinWX/Src/SConscript @@ -86,6 +86,6 @@ else: if env['HAVE_WX']: env.StaticLibrary(env['local_libs'] + 'memcard', memcardfiles) - env.Program('#' + exeGUI, files, LIBS = env['LIBS'] + wxlibs + libs) + env.Program(exeGUI, files, LIBS = env['LIBS'] + wxlibs + libs) else: - env.Program('#' + exeNoGUI, files, LIBS = env['LIBS'] + libs) + env.Program(exeNoGUI, files, LIBS = env['LIBS'] + libs) diff --git a/Source/DSPTool/Src/SConscript b/Source/DSPTool/Src/SConscript index b05391ceab..bb128a89e0 100644 --- a/Source/DSPTool/Src/SConscript +++ b/Source/DSPTool/Src/SConscript @@ -11,4 +11,4 @@ libs = [ 'common', ] -env.Program('#' + env['binary_dir'] + 'dsptool', files, LIBS = libs) +env.Program(env['binary_dir'] + 'dsptool', files, LIBS = libs) diff --git a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript index 223921d5c7..6d6b8c9439 100644 --- a/Source/Plugins/Plugin_DSP_HLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_HLE/Src/SConscript @@ -29,4 +29,4 @@ if env['HAVE_WX']: libs = [ 'common', 'audiocommon' ] -env.SharedLibrary('#' + env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript index ee08ef2bdb..b459171486 100644 --- a/Source/Plugins/Plugin_DSP_LLE/Src/SConscript +++ b/Source/Plugins/Plugin_DSP_LLE/Src/SConscript @@ -26,4 +26,4 @@ libs = [ 'dspcore', 'audiocommon', 'common' ] if env['HAVE_WX']: libs += [ 'debugger_ui_util' ] -env.SharedLibrary('#' + env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_VideoOGL/Src/SConscript b/Source/Plugins/Plugin_VideoOGL/Src/SConscript index bd3d8bb3bc..1faf2d265c 100644 --- a/Source/Plugins/Plugin_VideoOGL/Src/SConscript +++ b/Source/Plugins/Plugin_VideoOGL/Src/SConscript @@ -38,4 +38,4 @@ elif sys.platform == 'win32': elif not sys.platform == 'darwin' and env['HAVE_OPENCL']: libs += [ 'OpenCL' ] -env.SharedLibrary('#' + env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript index 0c439dc62a..f633dfba27 100644 --- a/Source/Plugins/Plugin_VideoSoftware/Src/SConscript +++ b/Source/Plugins/Plugin_VideoSoftware/Src/SConscript @@ -40,4 +40,4 @@ if sys.platform == 'darwin' and not env['HAVE_WX']: elif sys.platform == 'win32': files += [ 'Win32.cpp' ] -env.SharedLibrary('#' + env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_Wiimote/Src/SConscript b/Source/Plugins/Plugin_Wiimote/Src/SConscript index 3d0b6b5fbe..ab8754d4da 100644 --- a/Source/Plugins/Plugin_Wiimote/Src/SConscript +++ b/Source/Plugins/Plugin_Wiimote/Src/SConscript @@ -33,4 +33,4 @@ if env['HAVE_WIIUSE']: libs += [ 'wiiuse' ] files += [ 'wiimote_real.cpp' ] -env.SharedLibrary('#' + env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript index f4ac1bcfed..5df8597e90 100644 --- a/Source/Plugins/Plugin_WiimoteNew/Src/SConscript +++ b/Source/Plugins/Plugin_WiimoteNew/Src/SConscript @@ -31,4 +31,4 @@ if env['HAVE_WIIUSE']: files += [ 'WiimoteReal/WiimoteReal.cpp' ] libs += [ 'wiiuse' ] -env.SharedLibrary('#' + env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) +env.SharedLibrary(env['plugin_dir'] + name, files, LIBS = env['LIBS'] + libs) diff --git a/Source/UnitTests/SConscript b/Source/UnitTests/SConscript index aa0123f775..4ab5982668 100644 --- a/Source/UnitTests/SConscript +++ b/Source/UnitTests/SConscript @@ -12,4 +12,4 @@ libs = [ 'dspcore', 'common', ] -env.Program('#' + env['binary_dir'] + 'tester', files, LIBS = libs) +env.Program(env['binary_dir'] + 'tester', files, LIBS = libs)