From 9ecc606bce374ea093c6321f2d4921b5019a0b18 Mon Sep 17 00:00:00 2001 From: Wade Walker Date: Sun, 15 Dec 2013 16:16:18 -0600 Subject: Bug 884: Add standard JogAmp build files. 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. --- resources/stubs_includes/common/stddef.h | 24 ---------- resources/stubs_includes/common/stdint.h | 48 -------------------- resources/stubs_includes/gl/gltypes.h | 18 -------- resources/stubs_includes/jvm/jni.h | 78 -------------------------------- resources/stubs_includes/jvm/jni_md.h | 15 ------ 5 files changed, 183 deletions(-) delete mode 100644 resources/stubs_includes/common/stddef.h delete mode 100644 resources/stubs_includes/common/stdint.h delete mode 100644 resources/stubs_includes/gl/gltypes.h delete mode 100644 resources/stubs_includes/jvm/jni.h delete mode 100644 resources/stubs_includes/jvm/jni_md.h (limited to 'resources/stubs_includes') diff --git a/resources/stubs_includes/common/stddef.h b/resources/stubs_includes/common/stddef.h deleted file mode 100644 index f6c7207b..00000000 --- a/resources/stubs_includes/common/stddef.h +++ /dev/null @@ -1,24 +0,0 @@ -#ifndef __stddef_h_ -#define __stddef_h_ - - /** - * Look in the GlueGen.java API documentation for the build-in types (terminal symbols) - * definition. - * - * The following types are build-in: - * - * __int32 - * int32_t - * uint32_t - * __int64 - * int64_t - * uint64_t - * ptrdiff_t - * size_t - */ - - #define NULL ((void *)0) - - typedef int wchar_t; - -#endif /* __stddef_h_ */ diff --git a/resources/stubs_includes/common/stdint.h b/resources/stubs_includes/common/stdint.h deleted file mode 100644 index 4e456608..00000000 --- a/resources/stubs_includes/common/stdint.h +++ /dev/null @@ -1,48 +0,0 @@ -#ifndef __stdint_h_ -#define __stdint_h_ - - /** - * Look in the GlueGen.java API documentation for the build-in types (terminal symbols) - * definition. - * - * The following types are build-in: - * - * __int32 - * int32_t - * uint32_t - * __int64 - * int64_t - * uint64_t - * ptrdiff_t - * size_t - */ - - typedef signed char int8_t; - typedef unsigned short int16_t; - - typedef unsigned char uint8_t; - typedef unsigned short uint16_t; - - typedef ptrdiff_t intptr_t; - typedef size_t uintptr_t; - - /* Greatest-width integer types */ - /* Modern GCCs provide __INTMAX_TYPE__ */ - #if defined(__INTMAX_TYPE__) - typedef __INTMAX_TYPE__ intmax_t; - #elif __have_longlong64 - typedef signed long long intmax_t; - #else - typedef int64_t intmax_t; - #endif - - /* Modern GCCs provide __UINTMAX_TYPE__ */ - #if defined(__UINTMAX_TYPE__) - typedef __UINTMAX_TYPE__ uintmax_t; - #elif __have_longlong64 - typedef unsigned long long uintmax_t; - #else - typedef uint64_t uintmax_t; - #endif - -#endif /* __stdint_h_ */ diff --git a/resources/stubs_includes/gl/gltypes.h b/resources/stubs_includes/gl/gltypes.h deleted file mode 100644 index 3272b72a..00000000 --- a/resources/stubs_includes/gl/gltypes.h +++ /dev/null @@ -1,18 +0,0 @@ -//we need only the basic gl types for the cl-gl interoperability -//extracted from gl3.h - -typedef unsigned int GLenum; -typedef unsigned char GLboolean; -typedef unsigned int GLbitfield; -typedef signed char GLbyte; -typedef short GLshort; -typedef int GLint; -typedef int GLsizei; -typedef unsigned char GLubyte; -typedef unsigned short GLushort; -typedef unsigned int GLuint; -typedef float GLfloat; -typedef float GLclampf; -typedef double GLdouble; -typedef double GLclampd; -typedef void GLvoid; diff --git a/resources/stubs_includes/jvm/jni.h b/resources/stubs_includes/jvm/jni.h deleted file mode 100644 index be01d018..00000000 --- a/resources/stubs_includes/jvm/jni.h +++ /dev/null @@ -1,78 +0,0 @@ -/* Stub header for JNI which provides needed declarations without more - complicated and unnecessary constructs */ - -/* - * JNI Types - */ - -#include "jni_md.h" - -typedef unsigned char jboolean; -typedef unsigned short jchar; -typedef short jshort; -typedef float jfloat; -typedef double jdouble; - -typedef jint jsize; - -struct _jobject; - -typedef struct _jobject *jobject; -typedef jobject jclass; -typedef jobject jthrowable; -typedef jobject jstring; -typedef jobject jarray; -typedef jarray jbooleanArray; -typedef jarray jbyteArray; -typedef jarray jcharArray; -typedef jarray jshortArray; -typedef jarray jintArray; -typedef jarray jlongArray; -typedef jarray jfloatArray; -typedef jarray jdoubleArray; -typedef jarray jobjectArray; -typedef jobject jweak; - -typedef union jvalue { - jboolean z; - jbyte b; - jchar c; - jshort s; - jint i; - jlong j; - jfloat f; - jdouble d; - jobject l; -} jvalue; - -struct _jfieldID; -typedef struct _jfieldID *jfieldID; - -struct _jmethodID; -typedef struct _jmethodID *jmethodID; - -/* - * jboolean constants - */ - -#define JNI_FALSE 0 -#define JNI_TRUE 1 - -/* - * possible return values for JNI functions. - */ - -#define JNI_OK 0 /* success */ -#define JNI_ERR (-1) /* unknown error */ -#define JNI_EDETACHED (-2) /* thread detached from the VM */ -#define JNI_EVERSION (-3) /* JNI version error */ -#define JNI_ENOMEM (-4) /* not enough memory */ -#define JNI_EEXIST (-5) /* VM already created */ -#define JNI_EINVAL (-6) /* invalid arguments */ - -/* - * used in ReleaseScalarArrayElements - */ - -#define JNI_COMMIT 1 -#define JNI_ABORT 2 diff --git a/resources/stubs_includes/jvm/jni_md.h b/resources/stubs_includes/jvm/jni_md.h deleted file mode 100644 index 44978627..00000000 --- a/resources/stubs_includes/jvm/jni_md.h +++ /dev/null @@ -1,15 +0,0 @@ -#define _JNI_IMPORT_OR_EXPORT_ -#define JNIEXPORT -#define JNIIMPORT -#define JNICALL - -typedef int jint; -#ifdef _LP64 /* 64-bit Solaris */ -typedef long jlong; -#else -typedef long long jlong; -#endif - -typedef signed char jbyte; - -typedef long JNIEnv; -- cgit v1.2.3