Fix curl build.

This commit is contained in:
David Anderson 2011-06-29 19:09:29 -07:00
parent f2296e1f91
commit 987c87a7cf

View File

@ -19,10 +19,21 @@ def BuildCURL():
curl.AddCommand(command.DirectCommand(args)) curl.AddCommand(command.DirectCommand(args))
curl.AddCommand(command.ShellCommand('cd lib && make')) curl.AddCommand(command.ShellCommand('cd lib && make'))
else: else:
args = ['vcbuild', args = ''
os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib', projpath = os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib',
'build_libcurl.vcproj'), 'build_libcurl.vcproj')
'LIB Release'] try:
subprocess.Popen('vcbuild')
except:
xprojpath = os.path.join(AMBuild.sourceFolder, 'extensions', 'curl', 'curl-src', 'lib',
'build_libcurl.vcxproj')
if not os.path.isfile(xprojpath):
curl.AddCommand(command.DirectCommand(['vcupgrade', projpath]))
args = ['msbuild', xprojpath, '/p:Configuration=LIB Release']
if not args:
args = ['vcbuild', projpath, 'LIB Release']
curl.AddCommand(command.DirectCommand(args)) curl.AddCommand(command.DirectCommand(args))
#die "Unable to find libcurl.lib!\n" unless (-f "LIB-Release\\libcurl.lib"); #die "Unable to find libcurl.lib!\n" unless (-f "LIB-Release\\libcurl.lib");