diff options
author | Sven Gothel <[email protected]> | 2012-07-25 04:23:35 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2012-07-25 04:23:35 +0200 |
commit | 7bb5885fc3a904f49e22f0c8cbf747d9b189a7ba (patch) | |
tree | e5617fa74ff4a401fa60a080c5b3e8cf4ee21233 /make/build-newt.xml | |
parent | 00bef95008b02cc71e166da122884402e9381f44 (diff) |
SWT Update: SWT GLCanvas creates lazy when resource is ready; Create new NewtCanvasSWT allowing to parent NEWT windows natively.
SWT GLCanvas creates lazy when resource is ready
- Ensures drawable and context are created when size > zero and native visualID is valid.
The latter is platform dependent.
- Note that you cannot utilize custom GLCapabilities w/ this one,
since the configurations is already realized - use NewtCanvasSWT.
Create new NewtCanvasSWT allowing to parent NEWT windows natively:
- Similar to NewtCanvasAWT
- Allows attaching / detaching NEWT windows
NewtCanvasAWT: Public setNEWTChild(..) fixed
Added test cases for the above - tested on Linux, OSX and Windows w/ SWT
Note: As usual for OSX, add -XstartOnFirstThread
Details:
- NEWT Display has new method: 'EDTUtil setEDTUtil(EDTUtil)'
allowing to set a custom event dispatch utility.
We use this to set our SWTEDTUtil for using NEWT w/ SWT
complying w/ SWT threading constraints.
Diffstat (limited to 'make/build-newt.xml')
-rw-r--r-- | make/build-newt.xml | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/make/build-newt.xml b/make/build-newt.xml index a6be5042e..776708857 100644 --- a/make/build-newt.xml +++ b/make/build-newt.xml @@ -107,6 +107,9 @@ <property name="java.part.awt" value="com/jogamp/newt/awt/** com/jogamp/newt/event/awt/** jogamp/newt/awt/** ${java.part.driver.awt}"/> + <property name="java.part.swt" + value="com/jogamp/newt/swt/**"/> + <property name="java.part.driver.x11" value="jogamp/newt/driver/x11/**"/> @@ -135,11 +138,16 @@ <isset property="setup.noAWT"/> </condition> + <condition property="java.excludes.swt" + value="${java.part.swt}"> + <isset property="setup.noSWT"/> + </condition> + <condition property="java.excludes.opengl" value="${java.part.opengl}"> <isset property="setup.noOpenGL"/> </condition> - <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.opengl}" /> + <property name="java.excludes.all" value="${java.excludes.awt}, ${java.excludes.swt}, ${java.excludes.opengl}" /> <echo message="java.excludes.all: ${java.excludes.all}" /> </target> @@ -707,6 +715,13 @@ </jar> </target> + <target name="build-jars-swt" depends="setup-manifestfile" unless="setup.noSWT"> + <jar manifest="${build.newt}/manifest.mf" destfile="${newt-swt.jar}" filesonly="true"> + <fileset dir="${classes}" + includes="${java.part.swt}"/> + </jar> + </target> + <target name="build-jars-opengl" depends="setup-manifestfile" unless="setup.noOpenGL"> <jar manifest="${build.newt}/manifest.mf" destfile="${newt-ogl.jar}" filesonly="true"> <fileset dir="${classes}" @@ -741,7 +756,7 @@ </jar> </target> - <target name="build-jars-javase" depends="setup-manifestfile,build-jars-opengl,build-jars-awt,build-jars-driver"> + <target name="build-jars-javase" depends="setup-manifestfile,build-jars-opengl,build-jars-awt,build-jars-swt,build-jars-driver"> <jar manifest="${build.newt}/manifest.mf" destfile="${newt-core.jar}" filesonly="true"> <fileset dir="${classes}" includes="${java.part.core}"/> |