From 63e31d05ad9f1df99663997c2f04ad086f29c8fc Mon Sep 17 00:00:00 2001
From: Wade Walker <wwalker3@austin.rr.com>
Date: Sat, 29 Dec 2018 10:05:58 -0600
Subject: 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.
---
 make/build-staticglgen.xml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

(limited to 'make/build-staticglgen.xml')

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>
-- 
cgit v1.2.3