portability to Windows/VC++

tonycoz · Sep 1, 2009 · b8ea81a · b8ea81a
1 parent 812ae05
commit b8ea81a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/Makefile.PL b/Makefile.PL
@@ -1003,14 +1003,22 @@ 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
 	(
 	 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
@@ -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