diff --git a/SConstruct b/SConstruct index db2cb771f2..47771179d6 100644 --- a/SConstruct +++ b/SConstruct @@ -227,11 +227,13 @@ env['prefix'] = os.path.join(env['base_dir'] + 'Binary', platform.system() + '-' env['plugin_dir'] = env['prefix'] + 'Plugins/' #TODO add bin env['binary_dir'] = env['prefix'] -#TODO add libs +#TODO add bin env['libs_dir'] = env['prefix'] + 'Libs/' #TODO where should this go? env['data_dir'] = env['prefix'] +env['LINKFLAGS'] = [ '-Wl,-rpath=' + env['libs_dir'] ] + Export('env') rev = utils.GenerateRevFile(env['flavor'], diff --git a/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript b/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript index 3c8db4e78a..9835c5c381 100644 --- a/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript +++ b/Source/Plugins/Plugin_Wiimote_Test/Src/SConscript @@ -31,6 +31,7 @@ else: wiimoteenv.Append( CXXFLAGS = [ '-fPIC' ], LIBS = [ 'common', 'wiiuse' ], + LINKFLAGS = [ '-Wl,-rpath=' + env['libs_dir'] ] ) wiimoteenv.SharedLibrary(env['plugin_dir']+name, files)