commit 00de3f241f2c6132e1d548ae3f19c574e62275d6 Author: Sven Gothel Date: Sat Oct 3 20:15:51 2015 +0200 JOCL QueueThread extends InterruptSource.Thread commit f7c50fca34df0b5d393ffab0da09bce19ddfba64 Author: Sven Gothel Date: Tue Jul 14 18:28:29 2015 +0200 Include Khronos derived glcorearb.h before cl_gl.h, avoiding typedef mismatch w/ APPLE's GL LLVM's clang reports a typedef mismatch of GLintptr and GLsizeiptr between the Khronos derived glcorearb.h (from JOGL) and APPLE's gltypes.h when producing 32bit builds. +++ In file included from /usr/local/projects/jogamp/jocl/build-macosx-java6/gensrc/native/jocl/CLAbstractImpl_JNI.c:15: /usr/local/projects/jogamp/jogl/make/stub_includes/opengl/GL/glcorearb.h:604:19: error: typedef redefinition with different types ('ptrdiff_t' (aka 'int') vs 'intptr_t' (aka 'long')) typedef ptrdiff_t GLintptr; ^ /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/System/Library/Frameworks/OpenGL.framework/Headers/gltypes.h:51:18: note: previous definition is here typedef intptr_t GLintptr; +++ I.e. Khronos uses ptrdiff_t (aka 'int' on 32bit), where APPLE uses intptr_t (aka 'long' on 32bit). On OSX 32bit both ('int' and 'long') have the same sizeof value, i.e. 4 bytes, see below, hence the ABI is compatible! However, clang produces a typedef mismatch. Fix includes the Khronos derived (JOGL) glcorearb.h before cl_gl.h, hence favors the former 'canonical' definition. +++ OSX 10.10 32bit: sizeof int: 4 sizeof long: 4 sizeof long long: 8 sizeof intptr_t: 4 sizeof uintptr_t: 4 sizeof ptrdiff_t: 4 sizeof size_t: 4 sizeof float: 4 sizeof double: 8 sizeof long double: 16 OSX 10.10 64bit: sizeof int: 4 sizeof long: 8 sizeof long long: 8 sizeof intptr_t: 8 sizeof uintptr_t: 8 sizeof ptrdiff_t: 8 sizeof size_t: 8 sizeof float: 4 sizeof double: 8 sizeof long double: 16 commit 263bc4eba018a78f76dcc311c55372697d592627 Author: Wade Walker Date: Sun Jul 12 14:27:00 2015 -0500 Remove obsolete Netbeans build files The new Jogamp standard Ant build has been working correctly for a while now, so we can delete the old Netbeans build files safely. commit 02ef8884a2ca07de510bbc3fb17ff2a68083ad14 Author: Wade Walker Date: Sun Jul 12 14:24:15 2015 -0500 Remove stub includes that are duplicates of gluegen's and jogl's Removes jocl stub includes that are already defined in gluegen and jogl, and refers to those in gluegen and jogl instead. Requires the literalInclude parameter to the gluegen Ant task, since it must now refer to files outside the jocl project. commit 6affe9ce21fddc307712545a38caf735da52c1cf Author: Wade Walker Date: Mon Jul 6 15:09:55 2015 -0500 Add debug targets to match those in gluegen and jogl commit 5a5a23a533df0ec5f47f94a7bda901e703b25040 Author: Wade Walker Date: Sun Jul 5 09:53:06 2015 -0500 GLhandleARB set to void * on OS X, unsigned int everywhere else The OpenCL headers on OS X include gltypes.h, which defines GLhandleARB as void *, but the stub headers gl3.h and glext.h in JOCL were defining it as unsigned int. Put in a typedef to match how Khronos fixes the problem. See http://sourceforge.net/p/glew/bugs/206/, https://bitbucket.org/alfonse/glloadgen/issue/33/mac-compilation-error, https://www.opengl.org/registry/api/GL/glext.h, and https://www.khronos.org/bugzilla/show_bug.cgi?id=762 for more information.