From c563ed37f1bfbe0119cf59b2a7010002757d8af9 Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Thu, 8 Jun 2006 07:07:33 +0000 Subject: Added gfortran as compiler --- src/net/sf/antcontrib/cpptasks/CompilerEnum.java | 8 +++++++- src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java | 12 ++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) (limited to 'src/net/sf/antcontrib') diff --git a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java b/src/net/sf/antcontrib/cpptasks/CompilerEnum.java index 105892e..9bfb35b 100644 --- a/src/net/sf/antcontrib/cpptasks/CompilerEnum.java +++ b/src/net/sf/antcontrib/cpptasks/CompilerEnum.java @@ -66,7 +66,11 @@ import org.apache.tools.ant.types.EnumeratedAttribute; * * * g77 - * GNU FORTRAN compiler + * GNU FORTRAN 77 compiler + * + * + * gfortran + * GNU FORTRAN 95 compiler * * * msvc @@ -186,7 +190,9 @@ public class CompilerEnum extends EnumeratedAttribute { new ProcessorEnumValue("gcc", GccCCompiler.getInstance()), new ProcessorEnumValue("g++", GccCCompiler.getGppInstance()), new ProcessorEnumValue("c++", GccCCompiler.getCppInstance()), +// FREEHEP new ProcessorEnumValue("g77", GccCCompiler.getG77Instance()), + new ProcessorEnumValue("gfortran", GccCCompiler.getGFortranInstance()), new ProcessorEnumValue("msvc", DevStudioCCompiler.getInstance()), new ProcessorEnumValue("bcc", BorlandCCompiler.getInstance()), new ProcessorEnumValue("msrc", DevStudioResourceCompiler diff --git a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java b/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java index 0881055..49a3e35 100644 --- a/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java +++ b/src/net/sf/antcontrib/cpptasks/gcc/GccCCompiler.java @@ -59,6 +59,11 @@ public final class GccCCompiler extends GccCompatibleCCompiler { sourceExtensions, headerExtensions, false, new GccCCompiler("g77", sourceExtensions, headerExtensions, true, null, false, null), false, null); +// FREEHEP + private static final GccCCompiler gfortranInstance = new GccCCompiler("gfortran", + sourceExtensions, headerExtensions, false, + new GccCCompiler("gfortran", sourceExtensions, headerExtensions, true, + null, false, null), false, null); private static final GccCCompiler gppInstance = new GccCCompiler("g++", sourceExtensions, headerExtensions, false, new GccCCompiler("g++", sourceExtensions, headerExtensions, true, @@ -79,6 +84,13 @@ public final class GccCCompiler extends GccCompatibleCCompiler { public static GccCCompiler getG77Instance() { return g77Instance; } +// FREEHEP + /** + * Gets g95 adapter + */ + public static GccCCompiler getGFortranInstance() { + return gfortranInstance; + } /** * Gets gpp adapter */ -- cgit v1.2.3