diff --git a/Code/Mantid/Framework/PythonAPI/SConscript b/Code/Mantid/Framework/PythonAPI/SConscript index 3b6baa69ad7be32712de7567a6d9300f8451eb6f..4429458bfed5d05302126b6f57ed13c09912c171 100644 --- a/Code/Mantid/Framework/PythonAPI/SConscript +++ b/Code/Mantid/Framework/PythonAPI/SConscript @@ -24,10 +24,6 @@ if os.name == 'posix': myenv.Append(MYLIBLIST='boost_python' + myenv['BOOST_APPEND']) # windows else: - #python_path = 'C:/Python25/' - #myenv.Append(CPPPATH=python_path+'include/') - #myenv.Append(MYLIBDIRLIST=python_path+'libs/') - #myenv.Append(MYLIBLIST=python25) myenv.Replace(SHLIBSUFFIX='.pyd') listSharedObjects = MantidBuild.getSharedObjects(listCpps, myenv) diff --git a/Code/Mantid/Framework/SConstruct b/Code/Mantid/Framework/SConstruct index ca99c4adbe1a4310f0b04eb6523f5d9c410ba8c5..26983bf99ba94f7e4c1076fffc2717b237ebb090 100644 --- a/Code/Mantid/Framework/SConstruct +++ b/Code/Mantid/Framework/SConstruct @@ -85,7 +85,7 @@ if os.name == 'nt': boost_path = third_party + '/include/' - python_path = 'C:/Python25/' + python_path = sys.prefix.replace('\\','/') + '/' opencascade_path=third_party + '/include/OpenCascade' if int(debug) == 0: libList.append('PocoUtil') @@ -107,7 +107,7 @@ if os.name == 'nt': print "* Building for 64bit Windows *" libDirList.append(third_party + '/lib/win64/') - libList.append('python25') + libList.append('python%d%d' % (sys.version_info[0],sys.version_info[1])) libList.append('gsl') libList.append('ws2_32') # winsock library