turn off special handling of rpath for windows, SCons will do the rig…

…ht thing and just ignore it

SConstruct

@@ -254,6 +254,8 @@ defaults.warningFlags = '-Wall'
 defaults.buildPch = False
 env['pch_flags'] = []
 env['openmp_flag'] = '-fopenmp' # used to generate sample build scripts
+# use rpath linking
+defaults.includeRPath = True
 
 if 'gcc' in env.subst('$CC') or 'gnu-cc' in env.subst('$CC'):
     defaults.optimizeCcFlags += ' -Wno-inline'
@@ -264,8 +266,6 @@ if 'gcc' in env.subst('$CC') or 'gnu-cc' in env.subst('$CC'):
         defaults.cxxFlags = '-std=c++0x'
     defaults.buildPch = True
     env['pch_flags'] = ['-include', 'src/pch/system.h']
-    # use rpath linking
-    defaults.includeRPath = True
 
 elif env['CC'] == 'cl': # Visual Studio
     defaults.cxxFlags = ['/EHsc']
@@ -279,21 +279,18 @@ elif env['CC'] == 'cl': # Visual Studio
     defaults.buildPch = True
     env['pch_flags'] = ['/FIpch/system.h']
     env['openmp_flag'] = '/openmp'
-    defaults.includeRPath = False
 
 elif 'icc' in env.subst('$CC'):
     defaults.cxxFlags = '-std=c++0x'
     defaults.ccFlags = '-vec-report0 -diag-disable 1478'
     defaults.warningFlags = '-Wcheck'
     env['openmp_flag'] = '-openmp'
-    defaults.includeRPath = True
 
 elif 'clang' in env.subst('$CC'):
     defaults.ccFlags = '-fcolor-diagnostics'
     defaults.cxxFlags = '-std=c++11'
     defaults.buildPch = True
     env['pch_flags'] = ['-include-pch', 'src/pch/system.h.gch']
-    defaults.includeRPath = True
 
 else:
     print("WARNING: Unrecognized C compiler '%s'" % env['CC'])