diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1999-09-15 03:13:08 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1999-09-15 03:13:08 +0000 |
| commit | cffc5690053d6816a48f194eabd36edd17bee782 (patch) | |
| tree | bfe06d69f63f9f32288148a32192753eba0fca74 | |
| parent | b83c0eaa789c1e1527712ef4c3c985dde6539c3a (diff) | |
| download | perl-cffc5690053d6816a48f194eabd36edd17bee782.tar.gz | |
jpl tweak
p4raw-id: //depot/perl@4160
| -rw-r--r-- | MANIFEST | 11 | ||||
| -rw-r--r-- | jpl/JNI/Makefile.PL | 5 |
2 files changed, 12 insertions, 4 deletions
@@ -490,11 +490,19 @@ installperl Perl script to do "make install" dirty work intrpvar.h Variables held in each interpreter instance iperlsys.h Perl's interface to the system jpl/JNI/Changes Java Native Interface changes +jpl/JNI/Closer.java Java Native Interface example jpl/JNI/JNI.pm Java Native Interface module -jpl/JNI/JNI.xs Java Native Interface external subroutines +jpl/JNI/JNI.pm Java Native Interface module +jpl/JNI/JNIConfig Java Native Interface config +jpl/JNI/JNIConfig.Win32 Java Native Interface config +jpl/JNI/JNIConfig.kaffe Java Native Interface config +jpl/JNI/JNIConfig.noembed Java Native Interface config +jpl/JNI/JNIConfig.standard Java Native Interface config jpl/JNI/Makefile.PL Java Native Interface makefile generator jpl/JNI/test.pl Java Native Interface tests jpl/JNI/typemap Java/Perl interface typemap +jpl/JNI/typemap.gcc Java/Perl interface typemap +jpl/JNI/typemap.win32 Java/Perl interface typemap jpl/JPL/AutoLoader.pm Java/Perl compiler module jpl/JPL/Class.pm Java/Perl compiler module jpl/JPL/Compile.pm Java/Perl compiler module @@ -508,6 +516,7 @@ jpl/PerlInterpreter/PerlInterpreter.c Perl interpreter abstraction jpl/PerlInterpreter/PerlInterpreter.h Perl interpreter abstraction jpl/PerlInterpreter/PerlInterpreter.java Perl interpreter abstraction jpl/README JPL instructions +jpl/SETVARS.PL JPL setup jpl/Sample/Makefile.PL JPL sample makefile generator jpl/Sample/Sample.jpl JPL sample jpl/Test/Makefile.PL JPL tests makefile generator 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"]; |