aboutsummaryrefslogtreecommitdiffstats
path: root/make
diff options
context:
space:
mode:
Diffstat (limited to 'make')
-rw-r--r--make/build-jogl.xml5
-rw-r--r--make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java2
2 files changed, 6 insertions, 1 deletions
diff --git a/make/build-jogl.xml b/make/build-jogl.xml
index 547c8b184..c2da1cc73 100644
--- a/make/build-jogl.xml
+++ b/make/build-jogl.xml
@@ -216,6 +216,9 @@
<property name="java.part.util.fixedfuncemu"
value="com/sun/opengl/util/glsl/fixedfunc/**"/>
+ <property name="java.part.util.fixedfuncemu.shadercode"
+ value="com/sun/opengl/util/glsl/fixedfunc/impl/shaders/*, com/sun/opengl/util/glsl/fixedfunc/impl/shaders/bin/**"/>
+
<!-- condition excludes -->
<condition property="java.excludes.egl"
@@ -1700,6 +1703,8 @@
<jar manifest="tempversion" destfile="${jogl.util.fixedfuncemu.jar}">
<fileset dir="${classes}"
includes="${java.part.util.fixedfuncemu}"/>
+ <fileset dir="${src.java}"
+ includes="${java.part.util.fixedfuncemu.shadercode}"/>
</jar>
<jar manifest="tempversion" destfile="${jogl.all.jar}">
<fileset dir="${classes}">
diff --git a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
index 560124a99..4bf3832d4 100644
--- a/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
+++ b/make/config/jogl/gl-impl-CustomJavaCode-gl2es12.java
@@ -24,7 +24,7 @@ public GL2ES12Impl(GLContextImpl context) {
private boolean isGL2ES2;
public final boolean isGL() {
- return false;
+ return true;
}
public final boolean isGL2() {