From 61733489e8a2548ddbbb858a57abb5531c6adf10 Mon Sep 17 00:00:00 2001 From: Janet Anderson Date: Mon, 12 Jul 2010 14:54:51 -0500 Subject: [PATCH] Don't use manifest tool for MS Visual C++ 2010 (and later) builds. --- src/tools/useManifestTool.pl | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) mode change 100755 => 100644 src/tools/useManifestTool.pl diff --git a/src/tools/useManifestTool.pl b/src/tools/useManifestTool.pl old mode 100755 new mode 100644 index 8607e9c51..45986b662 --- a/src/tools/useManifestTool.pl +++ b/src/tools/useManifestTool.pl @@ -12,7 +12,11 @@ eval 'exec perl -S -w $0 ${1+"$@"}' # -*- Mode: perl -*- my $versionString=`cl 2>&1`; -if ($versionString =~ m/Version 14./) { +if ($versionString =~ m/Version 16./) { + $status=0; +} elsif ($versionString =~ m/Version 15./){ + $status=1; +} elsif ($versionString =~ m/Version 14./){ $status=1; } elsif ($versionString =~ m/Version 13.10/){ $status=0; @@ -25,7 +29,7 @@ if ($versionString =~ m/Version 14./) { } elsif ($versionString =~ m/Version 10./){ $status=0; } else { - $status=1; + $status=0; } print "$status\n"; exit;