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

Fix the global build on linux. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5923 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Glenn Rice 2010-07-20 04:19:25 +00:00
parent 244448014a
commit 8c7bdebf1e
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Externals/MemcardManager/SConscript vendored
View File

@ -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)

6
SConstruct
View File

@ -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'])

4
Source/Core/DolphinWX/Src/SConscript
View File

@ -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)

2
Source/DSPTool/Src/SConscript
View File

@ -11,4 +11,4 @@ libs = [
'common',
]
env.Program('#' + env['binary_dir'] + 'dsptool', files, LIBS = libs)
env.Program(env['binary_dir'] + 'dsptool', files, LIBS = libs)

2
Source/Plugins/Plugin_DSP_HLE/Src/SConscript
View File

@ -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)

2
Source/Plugins/Plugin_DSP_LLE/Src/SConscript
View File

@ -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)

2
Source/Plugins/Plugin_VideoOGL/Src/SConscript
View File

@ -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)

2
Source/Plugins/Plugin_VideoSoftware/Src/SConscript
View File

@ -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)

2
Source/Plugins/Plugin_Wiimote/Src/SConscript
View File

@ -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)

2
Source/Plugins/Plugin_WiimoteNew/Src/SConscript
View File

@ -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)

2
Source/UnitTests/SConscript
View File

@ -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)