avoid inconsistent dll linkage warnings with python + switch back to python.org install

This commit is contained in:
Dane Springmeyer 2014-08-31 13:58:25 -07:00
parent be44b647fa
commit 351c0894fa

View file

@ -156,12 +156,12 @@
"sources": [ '<!@(find bindings/python/ -name "*.cpp")' ], "sources": [ '<!@(find bindings/python/ -name "*.cpp")' ],
"dependencies": [ "mapnik" ], "dependencies": [ "mapnik" ],
'include_dirs': [ 'include_dirs': [
'c:/tools/python2-x86-32/include' 'c:/Python27/include'
], ],
'msvs_settings': { 'msvs_settings': {
'VCLinkerTool': { 'VCLinkerTool': {
'AdditionalLibraryDirectories': [ 'AdditionalLibraryDirectories': [
'c:/tools/python2-x86-32/libs' 'c:/Python27/libs'
] ]
} }
}, },
@ -174,6 +174,7 @@
'icuuc.lib', 'icuuc.lib',
'icuin.lib', 'icuin.lib',
], ],
'defines':['HAVE_ROUND','HAVE_HYPOT']
},{ },{
'libraries':[ 'libraries':[
'-lboost_thread' '-lboost_thread'