[btanks] Remove another rpath trigger.

[Bruno Wolff III]

commit 920b7ad16fe392d6b8845fede154c3bd5f51fbbe
Author: Bruno Wolff III <bruno at wolff.to>
Date:   Sun Jun 26 13:02:36 2011 -0500

    Remove another rpath trigger.

 btanks-remove-rpath.patch |   71 +++++++++++++++++++++++++-------------------
 1 files changed, 40 insertions(+), 31 deletions(-)
---
diff --git a/btanks-remove-rpath.patch b/btanks-remove-rpath.patch
index ec1d71d..6a05c5c 100644
--- a/btanks-remove-rpath.patch
+++ b/btanks-remove-rpath.patch
@@ -21,35 +21,6 @@
 -	env.Append(LINKFLAGS=['-Wl,-rpath-link,.'])
 -
  env.Program('clunk_test', ['test.cpp'], LIBS=['clunk'])
---- engine/SConscript.remove-rpath	2011-06-26 12:31:58.000000000 -0500
-+++ engine/SConscript	2011-06-26 12:33:42.000000000 -0500
-@@ -104,13 +104,6 @@
- #else: 
- #	bt_libs.append('GL')
- 
--if sys.platform != 'win32':
--	env.Append(LINKFLAGS=['-Wl,-rpath,'+ lib_dir])
--	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/mrt'])
--	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/sdlx'])
--	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/clunk'])
--
--
- bt = env.SharedLibrary('btanks_engine', bt_sources, LIBS=bt_libs)
- 
- if sys.platform != 'win32' and len(env['prefix']) > 0:
-@@ -129,12 +122,6 @@
- 	bt_main_libs.append('user32')
- 	bt_main_libs.append('sdlx_main')
- 
--if sys.platform != 'win32':
--	bt_env.Append(LINKFLAGS=['-Wl,-rpath,'+ lib_dir])
--	bt_env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/mrt'])
--	bt_env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/sdlx'])
--	bt_env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/clunk'])
--
- bt_main = bt_env.Program('btanks', bt_main_sources, LIBS=bt_main_libs, RPATH=[lib_dir])
- 
- if sys.platform == 'win32': 
 --- sdlx/SConscript.remove-rpath	2011-06-26 12:41:22.000000000 -0500
 +++ sdlx/SConscript	2011-06-26 12:41:48.000000000 -0500
 @@ -22,8 +22,6 @@
@@ -76,9 +47,40 @@
  sources = [
  	'bullet.cpp', 'explosion.cpp', 'single_pose.cpp',
  	'tank.cpp', 'shilka.cpp', 'launcher.cpp', 'ai_tank.cpp',
+--- engine/SConscript.remove-rpath	2009-12-30 07:50:33.000000000 -0600
++++ engine/SConscript	2011-06-26 12:59:39.000000000 -0500
+@@ -104,13 +104,6 @@
+ #else: 
+ #	bt_libs.append('GL')
+ 
+-if sys.platform != 'win32':
+-	env.Append(LINKFLAGS=['-Wl,-rpath,'+ lib_dir])
+-	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/mrt'])
+-	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/sdlx'])
+-	env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/clunk'])
+-
+-
+ bt = env.SharedLibrary('btanks_engine', bt_sources, LIBS=bt_libs)
+ 
+ if sys.platform != 'win32' and len(env['prefix']) > 0:
+@@ -129,13 +122,7 @@
+ 	bt_main_libs.append('user32')
+ 	bt_main_libs.append('sdlx_main')
+ 
+-if sys.platform != 'win32':
+-	bt_env.Append(LINKFLAGS=['-Wl,-rpath,'+ lib_dir])
+-	bt_env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/mrt'])
+-	bt_env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/sdlx'])
+-	bt_env.Append(LINKFLAGS=['-Wl,-rpath-link,build/' + env['mode'] + '/clunk'])
+-
+-bt_main = bt_env.Program('btanks', bt_main_sources, LIBS=bt_main_libs, RPATH=[lib_dir])
++bt_main = bt_env.Program('btanks', bt_main_sources, LIBS=bt_main_libs)
+ 
+ if sys.platform == 'win32': 
+ 	bt_env.AddPostAction(bt_main, 'mt.exe -nologo -manifest ${TARGET}.manifest -outputresource:$TARGET;2')
 --- editor/SConscript.remove-rpath	2009-12-30 07:50:33.000000000 -0600
-+++ editor/SConscript	2011-06-26 12:44:17.000000000 -0500
-@@ -20,13 +20,7 @@
++++ editor/SConscript	2011-06-26 13:01:36.000000000 -0500
+@@ -20,19 +20,13 @@
  
  env.Append(CPPPATH=['#/engine', '#/engine/src'])
  
@@ -93,3 +95,10 @@
  	libs.append('sdlx_main')
  	libs.append('user32')
  
+ env.Append(LIBPATH=['#/build/' + env['mode'] + '/engine'])
+ 
+-editor = env.Program('bted', ed_src, LIBS=libs, RPATH=[lib_dir])
++editor = env.Program('bted', ed_src, LIBS=libs)
+ 
+ if sys.platform != 'win32' and len(env['prefix']) > 0:
+ 	Import('install_targets')