summaryrefslogtreecommitdiffstats
path: root/make
Commit message (Collapse)AuthorAgeFilesLines
* Include Khronos derived glcorearb.h before cl_gl.h, avoiding typedef ↵Sven Gothel2015-07-143-13/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* Remove stub includes that are duplicates of gluegen's and jogl'sWade Walker2015-07-1210-8032/+22
| | | | | | 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.
* Add debug targets to match those in gluegen and joglWade Walker2015-07-061-1/+10
|
* GLhandleARB set to void * on OS X, unsigned int everywhere elseWade Walker2015-07-052-1/+9
| | | | | | | | | | | | 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.
* Adapt to GlueGen commit 5ca2db226e23c61339943f981a3f46300818cb9a (Use ↵v2.3.1Sven Gothel2015-03-271-2/+2
| | | | containingJTypeName for struct config)
* Adapt to GlueGen commit 454fac44efd1728d8f5c09ed4abd4041f6187e44: ↵v2.3.0Sven Gothel2015-03-111-2/+2
| | | | RenameJavaMethod -> RenameJavaSymbol
* Add javadoc arg (property 'javadoc.xarg1') '-Xdoclint:none' if java >= 1.8 ↵Sven Gothel2015-02-031-0/+2
| | | | (GlueGen commit d8dff4c9f2186749b167195eeb339c33f56864e8)
* Adapt APK install scripts for harmonized os.and.arch names, see GlueGen ↵Sven Gothel2015-02-034-7/+7
| | | | commit 3b43a223253176731567c6d8b7a67c9a6110782b
* Bug 682 - Relocating javax.media.opengl.* -> com.jogamp.opengl.*Sven Gothel2015-02-023-4/+4
|
* Bug 1122 - Add ARM 64bit build support, add Android ARM 64 bit build ↵Sven Gothel2015-02-023-0/+72
| | | | (build/install scripts only)
* Bug 1124 - Android Build: Use SDK >= 24.0.2 (build-tools >= 21.1.2) and NDK ↵Sven Gothel2015-01-281-52/+7
| | | | >= 10d
* Bug 1057: Analyze CLProgramTest freeze on Win 8.1 Intel i7-4770T CPU / HD ↵Sven Gothel2014-09-012-4/+4
| | | | | | | | Graphics 4600 - Properly enforce test order (alphanumeric) - Split builderTest() to synchronized and async tests
* Scripts: Bump to java 1.8.0_20Sven Gothel2014-08-312-4/+4
|
* Scripts: Bump to java 1.7.0_67 and apache-ant 1.9.4Sven Gothel2014-08-284-12/+12
|
* Bug 1024: Add fallback for native-jar-file location via classpathv2.2.0Sven Gothel2014-07-112-14/+40
| | | | Adapt to GlueGen commit f5c48efcf546ba4e08e197ccced6df83b57e1755
* Bug 1023/Bug 1024: Create native jar files for different configurations due ↵Sven Gothel2014-07-101-0/+2
| | | | to non-native-jar aliasing
* Add System.err log if CL/JNI library could not be loadedSven Gothel2014-06-251-3/+3
|
* Adapt to GlueGen commit 9ee44e1a289ecbac024662dd5a2ffc42e8add023 (Bug 1025)Sven Gothel2014-06-251-2/+2
|
* Adapt to GlueGen commit 2f6586292cd298bbc19d8acda0f7cf303c82078b (compount ↵Sven Gothel2014-06-182-2/+3
| | | | | | call-by-value extension) - initializeImpl() is no more required, since it's not forced .. uncomment in manual static initializer
* Adapt to GlueGen commit c3054a01990e55ab35756ea23ab7d7c05f24dd37 (compount ↵Sven Gothel2014-06-173-3/+7
| | | | call-by-value extension)
* unit test: preserve hs_err_pid*.log files (move to results folder for archive)Sven Gothel2014-05-091-0/+3
|
* Remove warnings, turn on linting, fix Eclipse.Wade Walker2014-03-072-5/+12
| | | | | | | Removed warnings due to memoryMaximumSize being ignored when javac isn't forked. Turned on all linting. Changed the arguments of uncomment-function-params so it will run from within Eclipse properly (using basedir instead of user.dir, since only the former will be properly set both inside Eclipse and on the command line).
* Remove alignment warning in gluegen preprocessing.Wade Walker2014-03-051-2/+5
| | | | | | | | Turns off the warning about CL_ALIGNED not being defined for the current compiler, but only inside the gluegen preprocessor. If CL_ALIGNED isn't defined for the real C compiler on the platform, the warning will still show up during C compilation.
* Remove unnamed struct emission warnings.Wade Walker2014-03-051-1/+12
| | | | Uses the new augmentation of gluegen's Ignore keyword.
* Pass function pointers into clEnqueueMapImage.Wade Walker2014-03-021-2/+2
| | | | | | | These pointers were showing up as uninitialized variables; on inspection they just weren't being passed in from the Java side or assigned on the C side. There are currently no tests of this function, which is how we didn't notice this omission.
* Load jocl.properties if present.Wade Walker2014-03-021-2/+2
| | | | This lets us build with debug information turned on.
* Fix C build warnings.Wade Walker2014-03-022-4/+3
| | | | | | Fixes -fno-rtti and implicit cast warnings. After this commit, all C warnings are gone except for one due to gluegen emitting char pointers instead of unsigned char pointers.
* Merge pull request #5 from WadeWalker/bug_978_fix_solaris_testsWade Walker2014-02-242-13/+15
|\ | | | | Fix OpenCL test failures on Solaris for bug 978.
| * Fix OpenCL test failures on Solaris.Wade Walker2014-02-232-13/+15
| | | | | | | | | | | | | | | | | | | | Since nobody currently makes an OpenCL driver for Solaris, all the tests used to fail, which told us nothing. This commit adds code to check whether OpenCL is unavailable and the OS is Solaris, in which case the test contents are skipped. If an OpenCL driver ever appears for Solaris, or if we start testing on another platform with no OpenCL driver, there's now one single place to add or remove checks that will allow for this.
* | Fix build.xml (regression): Re-activate 'generate.jdk6.autocloseable, ↵Sven Gothel2014-02-211-1/+1
| | | | | | | | | | | | generate.jdk7.autocloseable' in java.generate.impl Regression of commit 46cc6ebfb2f53daebceb9a36b553ff01af56999f
* | build.xml: Don't re-generate source (gluegen) if CLAbstractImpl_JNI.c ↵Sven Gothel2014-02-172-4/+9
| | | | | | | | uptodate (use java.generate.skip); Put native code on gensrc/native/jocl
* | Fix Bug 920 - JOCL does not work on windows with 32 bit vm (2/2)Sven Gothel2014-02-171-0/+3
| | | | | | | | | | | | | | | | | | | | | | All gluegen generated native function wrappers, miss CL_API_CALL in the function declarations similar to commit 569726132f622e290bebc5d40c96f8115dbcb5da. Adding gluegen calling convention to cl-impl.cfg: LocalProcAddressCallingConvention __ALL__ CL_API_CALL All tests passed on windows 32bit now!
* | Fix Bug 920 - JOCL does not work on windows with 32 bit vm (1/2)Sven Gothel2014-02-173-8/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The 'clGetExtensionFunctionAddress' function pointer declaration was faulty, i.e. using CL_API_ENTRY instead of CL_API_CALL. CL_API_CALL on windows is defined as '__stdcall' which impacts Window 32bit platforms. Fixed same issue w/: - clCreateContext - clBuildProgram Same issue occurs with _all_ gluegen generated native function wrappers, i.e. CL_API_CALL is missing in the function declarations! I will follow-up w/ this fix in a bit ..
* | Fix windows test scripts (CP, D_ARGS, ..)Sven Gothel2014-02-172-3/+14
| |
* | Fix build.xml: Remove gluegen config dependency on ../build using build-tempSven Gothel2014-02-172-12/+14
| | | | | | | | | | | | | | | | Fix copy2temp target and issue it before gluegen of cl-if.cfg. Note: ${project.root}/build cannot be a hard-dependency since ${rootrel.build} is configurable hence ${project.root}/${rootrel.build}.
* | Windows build scripts: Bump ant to 1.8.2Sven Gothel2014-02-172-2/+2
| |
* | script: set exec flagSven Gothel2014-02-151-0/+0
| |
* | Fix build scriptsSven Gothel2014-02-1513-29/+29
| |
* | Add scripts/check-junit.sh to validate local unit tests ..Sven Gothel2014-02-121-0/+39
|/
* Fix javadoc packagenamesv2.1.4Sven Gothel2014-01-311-2/+2
|
* Unit Tests: Also test 'Test*' while excluding inner classesSven Gothel2014-01-261-0/+2
|
* Fix build.xml: Processed CL stub_includes _must_ reside in current folder ↵Sven Gothel2014-01-261-6/+15
| | | | | | | | | | | | | (make) due to relative fileset access only! Commit aac4c5fc4ab7c77eff3b71f518100dd182ec2c33 moved processed CL stub_includes to 'build/includes', which would be 'nice to have'. However, due to relative fileset restrictions, we must locate it from current folder 'make'. Not detected, since an old 'make/includes/CL' was still around. Using dedicated folder 'make/stub_includes.gen'.
* Adapt all unit tests to use UITestCase and enforce named unit test order. ↵Sven Gothel2014-01-261-1/+15
| | | | Added main entry and listed in tests.sh for manual test.
* Add unit test TestJoclVersion and UITestCase base class for singleton unit ↵Sven Gothel2014-01-262-2/+3
| | | | tests ; Fix setenv-jocl.sh: Add jocl-test.jar
* Cleanup Build: GlueGen config files, stub_includes; Add JoclVersion, Android ↵Sven Gothel2014-01-2661-45/+548
| | | | | | | | | | | | | | | | | | JoclVersionActivity Cleanup Build: - Move gluegen config files into make/config (cleanup) - Move stub_includes into respective folder make/stub_includes and keep resources 'clean' JoclVersion: - Analoge to JoglVersion, replaces JOCLVersion (deprecated for now) - Added text based CL info dump. JoclVersionActivity: - Analog to JoclVersionActivity - Added full launch .. tested on Android (but no OpenCL avail.)
* build.xml: Fix jogl.build: Use [passed or default] jogl.build as well as ↵Sven Gothel2014-01-251-2/+3
| | | | rootrel.build (as gluegen does)
* Add '-b${joal.build.number}' to joal.version / archive.name ; Produce jar ↵Sven Gothel2014-01-252-18/+19
| | | | and apk files in ${build}/jar (as it was before new build system)
* Avoid sealed package violation: Move AutoCloseable to com.jogamp.openclSven Gothel2014-01-253-4/+6
|
* Bug 884: Move obsolete NB based build files to 'obsolete.make-nb' ; Fix text ↵Sven Gothel2014-01-2517-1/+484
| | | | file suffix ; Fix Jar Manifest: Move Sealed to bottom.
* Bug 884: Add standard JogAmp build files.Wade Walker2013-12-1544-0/+13190
The new make/build.xml successfully builds and tests the project. The original NetBeans build files are still present, but won't work anymore since the resources directory is now inside the make directory. The new build files are based on those of JOAL. The new build is not yet minimized and cleaned up, because this commit is meant to be the minimum way to get things functional.
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 11:30:17 +0000