1 files changed, 2 insertions, 3 deletions
diff --git a/jpl/JNI/Makefile.PL b/jpl/JNI/Makefile.PL
index 021970d1e5..1a54b9d82c 100644
--- a/jpl/JNI/Makefile.PL
+++ b/jpl/JNI/Makefile.PL
@@ -47,9 +47,7 @@ foreach (@JAVALIBS) {
         $INC =~ s#/#\\#g;
         $INC =~ s#\\$##;
         $CCFLAGS .= "-DWIN32 -Z7 -D_DEBUG";
-        $MYEXTLIB = "$libjava " .
-                "$Config{installarchlib}\\CORE\\perlcore.lib " .
-                "$Config{installarchlib}\\CORE\\perlcapi.lib";
+        $MYEXTLIB = $libjava;
     } elsif (/libkaffevm.so$/) {
         $CCFLAGS .= "-DKAFFE";
     }
@@ -98,6 +96,7 @@ my %Makefile = (
     LINKTYPE => 'dynamic',
     INC        => $INC,
     CCFLAGS => "$Config{ccflags} $CCFLAGS", 
+    ($Config{archname} =~ /mswin32.*-object/i ? ('CAPI' => 'TRUE') : ()),
 );
 
 $Makefile{LIBS} = ["$LIBPATH $LIBS"];