From: Tony Cook <tony@develop=help.com>
Date: Tue, 1 Sep 2009 13:28:31 +0000 (+0000)
Subject: portability to Windows/VC++
X-Git-Tag: Imager-0.71~30
X-Git-Url: http://git.imager.perl.org/imager.git/commitdiff_plain/b8ea81ac618dc9527fcf4a5188d0273e0818b195

portability to Windows/VC++
---

diff --git a/Makefile.PL b/Makefile.PL
index 843ef6a2..22f9ae9b 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -1003,6 +1003,14 @@ sub postcheck_tiff {
 
   my $tiffver_name = "probe/tiffver.txt";
 
+  my $lib;
+  if ($Config{cc} =~ /\b(cl|bcc)\b/) {
+    $lib = "libtiff";
+  }
+  else {
+    $lib = "tiff";
+  }
+
   my $good =
     eval {
       assert_lib
@@ -1010,7 +1018,7 @@ sub postcheck_tiff {
 	 debug => $VERBOSE,
 	 incpath => $format->{incdir},
 	 libpath => $format->{libdir},
-	 lib => "tiff",
+	 lib => $lib,
 	 header => [ qw(stdio.h tiffio.h) ],
 	 function => <<FUNCTION,
   {
diff --git a/inc/Devel/CheckLib.pm b/inc/Devel/CheckLib.pm
index 674b4f95..5d6ec52d 100644
--- a/inc/Devel/CheckLib.pm
+++ b/inc/Devel/CheckLib.pm
@@ -266,9 +266,9 @@ sub assert_lib {
                 $cfile,
                 "${lib}.lib",
                 "/Fe$exefile", 
+                (map { '/I'.Win32::GetShortPathName($_) } @incpaths),
                 "/link",
                 (map {'/libpath:'.Win32::GetShortPathName($_)} @libpaths),
-                (map { '/I'.Win32::GetShortPathName($_) } @incpaths)
             );
         } elsif($Config{cc} eq 'CC/DECC') {          # VMS
         } elsif($Config{cc} =~ /bcc32(\.exe)?/) {    # Borland