diff options
| author | Wade Walker <[email protected]> | 2018-12-29 10:05:58 -0600 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2019-08-19 09:06:37 +0200 |
| commit | 63e31d05ad9f1df99663997c2f04ad086f29c8fc (patch) | |
| tree | afb7a491e73987d34da0579ad52ff221a19a4cef /make/build-staticglgen.xml | |
| parent | 229adcb91ecb47391b93bb1c36453262acf70ff6 (diff) | |
Removed remaining bootclasspath and javah; build now works on Windows 10
(sgothel: This cherry picked merge will be refined)
Also removed a couple of duplicate "source" tags in javac tasks.
Diffstat (limited to 'make/build-staticglgen.xml')
| -rw-r--r-- | make/build-staticglgen.xml | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/make/build-staticglgen.xml b/make/build-staticglgen.xml index 8256fb00e..69785abee 100644 --- a/make/build-staticglgen.xml +++ b/make/build-staticglgen.xml @@ -29,13 +29,12 @@ <mkdir dir="${classes}" /> <!-- Compile BuildStaticGLInfo --> - <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}" + <javac srcdir="${src.java}" destdir="${classes}" includes="**/BuildStaticGLInfo.java" debug="true" debuglevel="${javacdebuglevel}" includeAntRuntime="false" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" - target="${target.targetlevel}" - bootclasspath="${target.rt.jar}"> + target="${target.targetlevel}"> <classpath refid="antlr.classpath" /> </javac> @@ -55,13 +54,12 @@ <!-- Build the BuildStaticGLInfo ANT task. - NOTE: ONLY the StaticGLGen is built at this time. BuildStaticGLInfo - itself is built in a separate task. --> - <javac destdir="${classes}" includes="**/StaticGLGenTask.java" source="${target.sourcelevel}" debug="true" debuglevel="${javacdebuglevel}" + <javac destdir="${classes}" includes="**/StaticGLGenTask.java" debug="true" debuglevel="${javacdebuglevel}" includeAntRuntime="true" memoryMaximumSize="${javac.memorymax}" encoding="UTF-8" source="${target.sourcelevel}" - target="${target.targetlevel}" - bootclasspath="${target.rt.jar}"> + target="${target.targetlevel}"> <src path="${src.java}" /> <classpath refid="classpath" /> </javac> |