Support mingw built perl

diff --git a/dynaload.c b/dynaload.c
index 8a6af06acc748c3c8f0cf94b673201c08246f47d..fbc55c71e891dd85bd40fff3b5b6df14ada96457 100644 (file)
--- a/dynaload.c
+++ b/dynaload.c
@@ -1,3 +1,4 @@
+#include "image.h"
 #include "dynaload.h"
 /* #include "XSUB.h"  so we can compile on threaded perls */
 #include "imagei.h"

diff --git a/dynfilt/Makefile.PL b/dynfilt/Makefile.PL
index 11793e3a3b30ed0fa513c5430f684363af7a2333..5cb6f040777c87f2babc1ef6b06c9a4ab2dc86e9 100644 (file)
--- a/dynfilt/Makefile.PL
+++ b/dynfilt/Makefile.PL
@@ -53,12 +53,11 @@ pure_all ::
 
 }
 elsif ($^O =~ /win32/i && $Config{cc} =~ /cl/) {
-    my @libpth = grep /\S/, split /("[^"]*"|\S+)/,$Config{libpth};
-    
+  my @libpth = grep /\S/, split /("[^"]*"|\S+)/,$Config{libpth};
         '
 all :: dynamic
 
-dynamic ::       '.$libstr.(join("\n",map { qq{
+dynamic :: '.$libstr.(join("\n",map { qq{
 
 $_.\$(SO): $_\$(OBJ_EXT)
     \$(LD) /OUT:\$\@ }.lddl_magic($_).qq{ \$(OTHERLDFLAGS) $_\$(OBJ_EXT) $Config{libs} }.join(' ', map "/libpath:$_", @libpth).qq{
@@ -72,13 +71,16 @@ pure_all ::
 ';
 
 } else {
-        '
-all :: dynamic
+  my $ldrun = $^O =~ /win32/i ? '' : 'LD_RUN_PATH="$(LD_RUN_PATH)"';
+  my $phony_colon = $Config{make} eq 'dmake' ? ':' : '::';
+    
+        "
+all $phony_colon dynamic
 
-dynamic ::       '.$libstr.(join("\n",map { qq{
+dynamic $phony_colon ".$libstr.(join("\n",map { qq{
 
 $_.\$(SO): $_\$(OBJ_EXT)
-       LD_RUN_PATH="\$(LD_RUN_PATH)" \$(LD) -o \$\@ \$(LDDLFLAGS) \$(OTHERLDFLAGS) $_\$(OBJ_EXT)
+       $ldrun \$(LD) -o \$\@ \$(LDDLFLAGS) \$(OTHERLDFLAGS) $_\$(OBJ_EXT)
 
 } } @plugins)).'
 

diff --git a/dynfilt/pluginst.h b/dynfilt/pluginst.h
index 3ba9bf0348c756b2fd1a9bda4251fc56f9374d3e..90bd60daf39bb193a00d3c20f4a34c46474f945e 100644 (file)
--- a/dynfilt/pluginst.h
+++ b/dynfilt/pluginst.h
@@ -1,6 +1,6 @@
 #include "../plug.h"
 
-#ifdef _MSC_VER
+#ifdef WIN32
 #define WIN32_EXPORT __declspec(dllexport)
 #else
 /* this may need to change for other Win32 compilers */

diff --git a/filters.c b/filters.c
index b02e7a322289485dbbe1871a7207a683ec22ca69..2523de51932120b8224aecf36ca5797788322b63 100644 (file)
--- a/filters.c
+++ b/filters.c
@@ -140,7 +140,7 @@ Inverts the pixel values by the amount specified.
 =cut
 */
 
-#ifdef _MSC_VER
+#ifdef WIN32
 /* random() is non-ASCII, even if it is better than rand() */
 #define random() rand()
 #endif

diff --git a/imio.h b/imio.h
index be56dedf15eea40302688c5fd8df618e91ff4a65..48a55d5cbb022ece0989f10d2143105ef0fa9776 100644 (file)
--- a/imio.h
+++ b/imio.h
@@ -2,10 +2,6 @@
 #define IMAGER_IMIO_H_
 #include <stdio.h>
 #include <sys/stat.h>
-#ifndef _MSC_VER
-#include <unistd.h>
-#include <sys/mman.h>
-#endif
 
 #include "log.h"