diff options
| author | Kenneth Russel <[email protected]> | 2008-05-29 09:34:56 +0000 |
|---|---|---|
| committer | Kenneth Russel <[email protected]> | 2008-05-29 09:34:56 +0000 |
| commit | 832372b20ea45100796a03d49eaff8db2826e3b9 (patch) | |
| tree | dbfac3193c37fbc029ac3238daed3ac73f1a2d88 /make/build.xml | |
| parent | 75f83018930f6594b29f16459c1e91b54842924b (diff) | |
Various bug fixes. Incorporated minimal window abstraction to
bootstrap EGL subsystem. Added back in GLU generation for ES 2. This
code creates and shows the window for the demos.es1.RedSquare demo,
but nothing is rendered yet.
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1645 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make/build.xml')
| -rw-r--r-- | make/build.xml | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/make/build.xml b/make/build.xml index 74ba34337..608e02e30 100644 --- a/make/build.xml +++ b/make/build.xml @@ -368,6 +368,7 @@ <target name="declare.win32.gles2" if="isGLES2"> <property name="gl.cfg" value="${config}/gl-es2.cfg" /> <property name="gl.c" value="${stub.includes.common}/gles2.c" /> + <property name="glu.cfg" value="${config}/glu-es2.cfg" /> </target> <target name="declare.win32.gles" depends="declare.win32.gles1, declare.win32.gles2" /> @@ -612,7 +613,7 @@ </gluegen> </target> - <target name="java.generate.glu" unless="isGLES2"> + <target name="java.generate.glu"> <echo message="Generating GLU class" /> <gluegen src="${stub.includes.common}/glu.c" config="${glu.cfg}" @@ -889,6 +890,8 @@ <include name="${rootrel.src.c.jogl}/*.m" if="isOSX"/> <!-- FIXME: the Mixer should be moved to another library --> <include name="${rootrel.src.c.jogl}/Mixer.cpp" if="isWindows"/> + <!-- FIXME: the WindowsWindow should be moved to another library --> + <include name="${rootrel.src.c.jogl}/WindowsWindow.c" if="isWindows"/> <include name="${rootrel.generated.c.jogl}/*GL*.c" unless="jogl.noglnatives"/> <include name="${rootrel.src.c.jogl}/XineramaHelper.c" if="isX11"/> <!-- Xinerama supporting functions for Linux only (for now) --> @@ -1007,6 +1010,8 @@ <!-- Generate the waveout Mixer header --> <!-- FIXME: this is temporary until we move this to another workspace --> <javah destdir="../build/gensrc/native/jogl" classpath="${jogl.jar}" class="com.sun.javafx.audio.windows.waveout.Mixer" /> + <!-- FIXME: this is temporary until we move this to another workspace --> + <javah destdir="../build/gensrc/native/jogl" classpath="${jogl.jar}" class="com.sun.javafx.newt.windows.WindowsWindow" /> <!-- Compile stuff --> <antcall target="c.build" inheritRefs="true"> |