diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2007-07-06 19:06:29 +0000 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2007-07-06 19:06:29 +0000 |
| commit | 2dac20493cf190fb56f04d1fe22f58c30eac1869 (patch) | |
| tree | ebbcea6f539fbb3a474217c45502632f0c84289a /src/net/sf/antcontrib/cpptasks/LinkerEnum.java | |
| parent | 502ee6ac6df5cd8aa19c2c1f9db87861d763ac1b (diff) | |
| download | cpptasks-parallel-2dac20493cf190fb56f04d1fe22f58c30eac1869.tar.gz cpptasks-parallel-2dac20493cf190fb56f04d1fe22f58c30eac1869.tar.bz2 cpptasks-parallel-2dac20493cf190fb56f04d1fe22f58c30eac1869.tar.xz cpptasks-parallel-2dac20493cf190fb56f04d1fe22f58c30eac1869.zip | |
Fixed NARPLUGIN-106
Diffstat (limited to 'src/net/sf/antcontrib/cpptasks/LinkerEnum.java')
| -rw-r--r-- | src/net/sf/antcontrib/cpptasks/LinkerEnum.java | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/net/sf/antcontrib/cpptasks/LinkerEnum.java b/src/net/sf/antcontrib/cpptasks/LinkerEnum.java index c5b47bc..90ee7ca 100644 --- a/src/net/sf/antcontrib/cpptasks/LinkerEnum.java +++ b/src/net/sf/antcontrib/cpptasks/LinkerEnum.java @@ -26,20 +26,20 @@ import net.sf.antcontrib.cpptasks.gcc.GppLinker; import net.sf.antcontrib.cpptasks.gcc.LdLinker; import net.sf.antcontrib.cpptasks.hp.aCCLinker; import net.sf.antcontrib.cpptasks.ibm.VisualAgeLinker; -// FREEHEP -import net.sf.antcontrib.cpptasks.intel.IntelLinux32CLinker; -import net.sf.antcontrib.cpptasks.intel.IntelLinux64CLinker; import net.sf.antcontrib.cpptasks.intel.IntelLinux32Linker; +import net.sf.antcontrib.cpptasks.intel.IntelLinux32CLinker; import net.sf.antcontrib.cpptasks.intel.IntelLinux64Linker; +import net.sf.antcontrib.cpptasks.intel.IntelLinux64CLinker; import net.sf.antcontrib.cpptasks.intel.IntelWin32Linker; +import net.sf.antcontrib.cpptasks.openwatcom.OpenWatcomCLinker; +import net.sf.antcontrib.cpptasks.openwatcom.OpenWatcomFortranLinker; import net.sf.antcontrib.cpptasks.os390.OS390Linker; import net.sf.antcontrib.cpptasks.os400.IccLinker; import net.sf.antcontrib.cpptasks.sun.C89Linker; import net.sf.antcontrib.cpptasks.sun.ForteCCLinker; import net.sf.antcontrib.cpptasks.ti.ClxxLinker; + import org.apache.tools.ant.types.EnumeratedAttribute; -import net.sf.antcontrib.cpptasks.openwatcom.OpenWatcomCLinker; -import net.sf.antcontrib.cpptasks.openwatcom.OpenWatcomFortranLinker; /** * Enumeration of supported linkers @@ -59,11 +59,12 @@ public class LinkerEnum extends EnumeratedAttribute { .getInstance()), new ProcessorEnumValue("icl", IntelWin32Linker.getInstance()), new ProcessorEnumValue("ecl", IntelWin32Linker.getInstance()), - new ProcessorEnumValue("icc", IntelLinux32Linker.getInstance()), - new ProcessorEnumValue("ecc", IntelLinux64Linker.getInstance()), -// FREEHEP +// BEGINFREEHEP + new ProcessorEnumValue("icc", IntelLinux32CLinker.getInstance()), + new ProcessorEnumValue("ecc", IntelLinux64CLinker.getInstance()), new ProcessorEnumValue("icpc", IntelLinux32Linker.getInstance()), new ProcessorEnumValue("ecpc", IntelLinux64Linker.getInstance()), +// ENDFREEHEP new ProcessorEnumValue("CC", ForteCCLinker.getInstance()), new ProcessorEnumValue("aCC", aCCLinker.getInstance()), new ProcessorEnumValue("os390", OS390Linker.getInstance()), |