diff --git a/jni/jni/build-windows64.xml b/jni/jni/build-windows64.xml new file mode 100644 index 00000000..f26cd7c5 --- /dev/null +++ b/jni/jni/build-windows64.xml @@ -0,0 +1,203 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/jni/jni/gl/utils.c b/jni/jni/gl/utils.c index 67b6b7e9..31609d46 100644 --- a/jni/jni/gl/utils.c +++ b/jni/jni/gl/utils.c @@ -102,7 +102,7 @@ matrix4_proj2D(float* mat, float* vec, float *out); jlong JNI(alloc)(JNIEnv *env, jclass* clazz) { - return (long) calloc(16, sizeof(float)); + return (jlong) calloc(16, sizeof(float)); } jobject JNI(getBuffer)(JNIEnv *env, jclass* clazz,jlong ptr){ diff --git a/jni/jni/org.oscim.utils.TessJNI.cpp b/jni/jni/org.oscim.utils.TessJNI.cpp index ce73df4b..98c1fcf2 100644 --- a/jni/jni/org.oscim.utils.TessJNI.cpp +++ b/jni/jni/org.oscim.utils.TessJNI.cpp @@ -23,7 +23,7 @@ //@line:131 { if (size <= 0) - return (long)tessNewTess(0); + return (jlong)tessNewTess(0); if (size > 10) size = 10; TESSalloc ma; @@ -39,7 +39,7 @@ ma.regionBucketSize = 1 << size; // 256 ma.extraVertices = 8; //ma.extraVertices = 256; - return (long)tessNewTess(&ma); + return (jlong)tessNewTess(&ma); } } diff --git a/vtm-desktop/natives/windows/vtm-jni64.dll b/vtm-desktop/natives/windows/vtm-jni64.dll index b19928bd..b926665f 100644 Binary files a/vtm-desktop/natives/windows/vtm-jni64.dll and b/vtm-desktop/natives/windows/vtm-jni64.dll differ