From 760de60a50beffd524d1e8dd4997055c8bc0f010 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Mon, 12 Jun 2006 20:20:58 +0000 Subject: Latest on gpp linker --- src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java') diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java b/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java index 84421f1..6248e00 100644 --- a/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java +++ b/src/net/sf/antcontrib/cpptasks/gcc/GppLinker.java @@ -46,6 +46,9 @@ public class GppLinker extends AbstractLdLinker { discardFiles, "", "", false, null); private static final GppLinker machDllLinker = new GppLinker("gcc", objFiles, discardFiles, "lib", ".dylib", false, null); +// FREEHEP + private static final GppLinker machJNILinker = new GppLinker("gcc", + objFiles, discardFiles, "lib", ".jnilib", false, null); private static final GppLinker machPluginLinker = new GppLinker("gcc", objFiles, discardFiles, "lib", ".bundle", false, null); public static GppLinker getInstance() { @@ -186,6 +189,14 @@ public class GppLinker extends AbstractLdLinker { if (type.isStaticLibrary()) { return GccLibrarian.getInstance(); } +// FREEHEP + if (type.isJNIModule()) { + if (isDarwin()) { + return machJNILinker; + } else { + return dllLinker; + } + } if (type.isPluginModule()) { if (GccProcessor.getMachine().indexOf("darwin") >= 0) { return machPluginLinker; -- cgit v1.2.3