michael/lwjgl
michael
/
lwjgl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed build to include missing OpenGL ES classes on which Display depends. 

Excluded desktop OpenGL extensions from the OpenGL ES build.
This commit is contained in:
Ioannis Tsakpinis 2011-10-11 16:06:23 +00:00
parent a1563394c6
commit d56bd9a420
3 changed files with 39 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
build.xml
View File

@ -132,6 +132,7 @@
<!-- Create lwjgl.jar -->
<jar destfile="${lwjgl.temp}/jar/lwjgl-debug.jar" taskname="lwjgl-debug.jar">
<fileset refid="lwjgl.fileset" />
<fileset refid="lwjgl.fileset.dependencies"/>
<manifest>
<attribute name="Sealed" value="true"/>
</manifest>
@ -143,12 +144,7 @@
<!-- Create lwjgl.jar -->
<jar destfile="${lwjgl.temp}/jar/lwjgl.jar" taskname="lwjgl.jar">
<fileset refid="lwjgl.fileset" />
<fileset dir="${lwjgl.bin}"> <!-- Display has a dependency on these -->
<patternset>
<include name="org/lwjgl/opengles/ContextAttribs.*"/>
<include name="org/lwjgl/opengles/PixelFormat.*"/>
</patternset>
</fileset>
<fileset refid="lwjgl.fileset.dependencies"/>
<manifest>
<attribute name="Sealed" value="true"/>
</manifest>
@ -177,9 +173,40 @@
<!-- Packages the java files for the ES build -->
<target name="-createjars_es">
<!-- ================================================================== -->
<!-- Generate a list of the OpenGL extension classes -->
<!-- ================================================================== -->
<fileset id="opengl-template-fileset" dir="${lwjgl.src}/generated" includes="${opengl-template-pattern}"/>
<property name="opengl-template-files" refid="opengl-template-fileset"/>
<tempfile property="temp.file"/>
<echo file="${temp.file}" message="${opengl-template-files}" taskname=""/>
<loadfile srcfile="${temp.file}" property="opengl-template-classes">
<filterchain>
<tokenfilter delimoutput=",">
<stringtokenizer delims=";"/>
<replaceregex pattern="org\${file.separator}lwjgl\${file.separator}opengl\${file.separator}(.+)[.]java"
replace="org/lwjgl/opengl/\1.class"/>
</tokenfilter>
</filterchain>
</loadfile>
<delete file="${temp.file}" />
<!-- Create lwjgl.jar -->
<jar destfile="${lwjgl.temp}/jar/lwjgl.jar" taskname="lwjgl.jar">
<fileset refid="lwjgl_es.fileset"/>
<!-- Files to include in the lwjgl.jar file, for the ES build -->
<fileset dir="${lwjgl.bin}" excludes="${opengl-template-classes}">
<patternset id="lwjgl_es.package.pattern">
<include name="org/**/*"/>
<exclude name="org/lwjgl/d3d/**"/>
<exclude name="org/lwjgl/test/**"/>
<exclude name="org/lwjgl/util/**"/>
<exclude name="org/lwjgl/examples/**"/>
</patternset>
</fileset>
<manifest>
<attribute name="Sealed" value="true"/>
</manifest>

13
platform_build/build-definitions.xml
View File

@ -35,15 +35,10 @@
<exclude name="org/lwjgl/examples/**" />
</patternset>
</fileset>
<!-- Files to include in the lwjgl.jar file, for the ES build -->
<fileset id="lwjgl_es.fileset" dir="${lwjgl.bin}">
<patternset id="lwjgl_es.package.pattern">
<include name="org/**/*"/>
<exclude name="org/lwjgl/d3d/**"/>
<exclude name="org/lwjgl/test/**"/>
<exclude name="org/lwjgl/util/**"/>
<exclude name="org/lwjgl/examples/**"/>
<fileset id="lwjgl.fileset.dependencies" dir="${lwjgl.bin}">
<patternset id="lwjgl.package.dependencies.pattern">
<include name="org/lwjgl/opengles/ContextAttribs*.*"/>
<include name="org/lwjgl/opengles/PixelFormat*.*"/>
</patternset>
</fileset>

1
platform_build/build-maven.xml
View File

@ -8,6 +8,7 @@
<fileset id="lwjgl-sources.manual.fileset" dir="${lwjgl.src.java}">
<patternset refid="lwjgl.package.pattern" />
<patternset refid="lwjgl.package.dependencies.pattern"/>
</fileset>
<fileset id="lwjgl-sources.generated.fileset" dir="${lwjgl.src.generated}">