Skip to content
Snippets Groups Projects
Commit d697b86c authored by Gigg, Martyn Anthony's avatar Gigg, Martyn Anthony
Browse files

Refs #2615. Missed a couple of references to hard-coded Python25 libraries.

parent 28894b5c
No related branches found
No related tags found
No related merge requests found
...@@ -24,10 +24,6 @@ if os.name == 'posix': ...@@ -24,10 +24,6 @@ if os.name == 'posix':
myenv.Append(MYLIBLIST='boost_python' + myenv['BOOST_APPEND']) myenv.Append(MYLIBLIST='boost_python' + myenv['BOOST_APPEND'])
# windows # windows
else: 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') myenv.Replace(SHLIBSUFFIX='.pyd')
listSharedObjects = MantidBuild.getSharedObjects(listCpps, myenv) listSharedObjects = MantidBuild.getSharedObjects(listCpps, myenv)
......
...@@ -85,7 +85,7 @@ if os.name == 'nt': ...@@ -85,7 +85,7 @@ if os.name == 'nt':
boost_path = third_party + '/include/' boost_path = third_party + '/include/'
python_path = 'C:/Python25/' python_path = sys.prefix.replace('\\','/') + '/'
opencascade_path=third_party + '/include/OpenCascade' opencascade_path=third_party + '/include/OpenCascade'
if int(debug) == 0: if int(debug) == 0:
libList.append('PocoUtil') libList.append('PocoUtil')
...@@ -107,7 +107,7 @@ if os.name == 'nt': ...@@ -107,7 +107,7 @@ if os.name == 'nt':
print "* Building for 64bit Windows *" print "* Building for 64bit Windows *"
libDirList.append(third_party + '/lib/win64/') 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('gsl')
libList.append('ws2_32') # winsock library libList.append('ws2_32') # winsock library
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment