Menu
▾
▴
[Java-game-lib-cvs] SF.net SVN: java-game-lib:[3431] trunk/LWJGL/src
|
From: <sp...@us...> - 2010-10-04 22:51:26
|
Revision: 3431
http://java-game-lib.svn.sourceforge.net/java-game-lib/?rev=3431&view=rev
Author: spasi
Date: 2010-10-04 22:51:19 +0000 (Mon, 04 Oct 2010)
Log Message:
-----------
Fixed 64bit loading.
Modified Paths:
--------------
trunk/LWJGL/src/java/org/lwjgl/Sys.java
Removed Paths:
-------------
trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.h
trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.h
trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.h
Modified: trunk/LWJGL/src/java/org/lwjgl/Sys.java
===================================================================
--- trunk/LWJGL/src/java/org/lwjgl/Sys.java 2010-10-04 17:04:46 UTC (rev 3430)
+++ trunk/LWJGL/src/java/org/lwjgl/Sys.java 2010-10-04 22:51:19 UTC (rev 3431)
@@ -84,6 +84,7 @@
if (implementation.has64Bit()) {
try {
doLoadLibrary(lib_name + POSTFIX64BIT);
+ return;
} catch (UnsatisfiedLinkError e2) {
LWJGLUtil.log("Failed to load 64 bit library: " + e2.getMessage());
}
Deleted: trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.h
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.h 2010-10-04 17:04:46 UTC (rev 3430)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opencl_CL.h 2010-10-04 22:51:19 UTC (rev 3431)
@@ -1,62 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_lwjgl_opencl_CL */
-
-#ifndef _Included_org_lwjgl_opencl_CL
-#define _Included_org_lwjgl_opencl_CL
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: created */
-/*
- * Class: org_lwjgl_opencl_CL
- * Method: nCreate
- * Signature: (Ljava/lang/String;)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CL_nCreate
- (JNIEnv *, jclass, jstring);
-
-/*
- * Class: org_lwjgl_opencl_CL
- * Method: nCreateDefault
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CL_nCreateDefault
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opencl_CL
- * Method: nDestroy
- * Signature: ()V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CL_nDestroy
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opencl_CL
- * Method: getFunctionAddress
- * Signature: (Ljava/lang/String;)J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CL_getFunctionAddress
- (JNIEnv *, jclass, jstring);
-
-/*
- * Class: org_lwjgl_opencl_CL
- * Method: getHostBuffer
- * Signature: (JI)Ljava/nio/ByteBuffer;
- */
-JNIEXPORT jobject JNICALL Java_org_lwjgl_opencl_CL_getHostBuffer
- (JNIEnv *, jclass, jlong, jint);
-
-/*
- * Class: org_lwjgl_opencl_CL
- * Method: resetNativeStubs
- * Signature: (Ljava/lang/Class;)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CL_resetNativeStubs
- (JNIEnv *, jclass, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
Deleted: trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.h
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.h 2010-10-04 17:04:46 UTC (rev 3430)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opencl_CallbackUtil.h 2010-10-04 22:51:19 UTC (rev 3431)
@@ -1,94 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_lwjgl_opencl_CallbackUtil */
-
-#ifndef _Included_org_lwjgl_opencl_CallbackUtil
-#define _Included_org_lwjgl_opencl_CallbackUtil
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: contextUserData */
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: ncreateGlobalRef
- * Signature: (Ljava/lang/Object;)J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_ncreateGlobalRef
- (JNIEnv *, jclass, jobject);
-
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: deleteGlobalRef
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opencl_CallbackUtil_deleteGlobalRef
- (JNIEnv *, jclass, jlong);
-
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: getContextCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getContextCallback
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: getMemObjectDestructorCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getMemObjectDestructorCallback
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: getBuildProgramCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getBuildProgramCallback
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: getNativeKernelCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getNativeKernelCallback
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: getEventCallback
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getEventCallback
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: getLogMessageToSystemLogAPPLE
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getLogMessageToSystemLogAPPLE
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: getLogMessageToStdoutAPPLE
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getLogMessageToStdoutAPPLE
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opencl_CallbackUtil
- * Method: getLogMessageToStderrAPPLE
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opencl_CallbackUtil_getLogMessageToStderrAPPLE
- (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
Deleted: trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.h
===================================================================
--- trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.h 2010-10-04 17:04:46 UTC (rev 3430)
+++ trunk/LWJGL/src/native/common/org_lwjgl_opengl_CallbackUtil.h 2010-10-04 22:51:19 UTC (rev 3431)
@@ -1,47 +0,0 @@
-/* DO NOT EDIT THIS FILE - it is machine generated */
-#include <jni.h>
-/* Header for class org_lwjgl_opengl_CallbackUtil */
-
-#ifndef _Included_org_lwjgl_opengl_CallbackUtil
-#define _Included_org_lwjgl_opengl_CallbackUtil
-#ifdef __cplusplus
-extern "C" {
-#endif
-/* Inaccessible static: contextUserParamsARB */
-/* Inaccessible static: contextUserParamsAMD */
-/*
- * Class: org_lwjgl_opengl_CallbackUtil
- * Method: ncreateGlobalRef
- * Signature: (Ljava/lang/Object;)J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_CallbackUtil_ncreateGlobalRef
- (JNIEnv *, jclass, jobject);
-
-/*
- * Class: org_lwjgl_opengl_CallbackUtil
- * Method: deleteGlobalRef
- * Signature: (J)V
- */
-JNIEXPORT void JNICALL Java_org_lwjgl_opengl_CallbackUtil_deleteGlobalRef
- (JNIEnv *, jclass, jlong);
-
-/*
- * Class: org_lwjgl_opengl_CallbackUtil
- * Method: getDebugOutputCallbackARB
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_CallbackUtil_getDebugOutputCallbackARB
- (JNIEnv *, jclass);
-
-/*
- * Class: org_lwjgl_opengl_CallbackUtil
- * Method: getDebugOutputCallbackAMD
- * Signature: ()J
- */
-JNIEXPORT jlong JNICALL Java_org_lwjgl_opengl_CallbackUtil_getDebugOutputCallbackAMD
- (JNIEnv *, jclass);
-
-#ifdef __cplusplus
-}
-#endif
-#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
