diff options
| author | Kenneth Russel <[email protected]> | 2008-07-05 22:51:05 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2008-07-05 22:51:05 +0000 |
| commit | 10da99b3413d3fe0e208e1089c76b4f15be423a3 (patch) | |
| tree | 950614574d34c92fd58e9bbc8737da91427709e9 | |
| parent | d49242441f97e203f607747023914aae5c66b6d0 (diff) | |
Fixed problem with cdcfp bootclasspath breaking Windows builds
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1711 232f8b59-042b-4e1e-8c03-345bb8c30851
| -rw-r--r-- | make/build.xml | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index 453c57411..78c9894c2 100644 --- a/make/build.xml +++ b/make/build.xml @@ -978,7 +978,7 @@ </javac> </target> - <target name="java.compile.secondpass" depends="java.generate.composable.pipeline"> + <target name="java.compile.secondpass.1" if="javac.bootclasspath.jar"> <!-- Perform the second pass Java compile; everything. --> <javac destdir="${classes}" excludes="${java.excludes.all}" @@ -993,6 +993,21 @@ </javac> </target> + <target name="java.compile.secondpass.2" unless="javac.bootclasspath.jar"> + <!-- Perform the second pass Java compile; everything. --> + <javac destdir="${classes}" + excludes="${java.excludes.all}" + source="${jogl.sourcelevel}" + classpath="${gluegen-rt.jar}" + fork="yes" + memoryMaximumSize="128m" + debug="true" debuglevel="source,lines"> + <src path="${src.java}" /> + <src path="${src.generated.java}" /> + </javac> + </target> + + <target name="java.compile.secondpass" depends="java.generate.composable.pipeline,java.compile.secondpass.1,java.compile.secondpass.2" /> <target name="java.compile" depends="java.compile.firstpass,java.compile.secondpass" /> |