2.7.0 release ..

1 files changed, 4 insertions, 47 deletions

diff --git a/CNativeCode/OpenGL_misc.h b/CNativeCode/OpenGL_misc.h
index 1438877..8f307c4 100644
--- a/CNativeCode/OpenGL_misc.h
+++ b/CNativeCode/OpenGL_misc.h
@@ -12,52 +12,18 @@
 
 	#include <jni.h>
 
-	#include<GL/gl.h>
-	#include <GL/glu.h>
+	#include "gltool.h"
 
 	#ifndef LIBAPIENTRY
 		#define LIBAPIENTRY
 	#endif
 	#ifndef LIBAPI
-		#define LIBAPI
+		#define LIBAPI extern
 	#endif
 
-	#ifndef USE_64BIT_POINTER
-		typedef int  PointerHolder;
-	#else
-		typedef long PointerHolder;
-	#endif
-
-	  /* to match the GLCapabilities values .. */
-
-	  #define BUFFER_SINGLE 0
-	  #define BUFFER_DOUBLE 1
-	 
-	  #define COLOR_INDEX 0
-	  #define COLOR_RGBA  1
-	  
-	  #define STEREO_OFF 0
-	  #define STEREO_ON  1
-
-	  typedef struct {
-		  jint buffer;
-		  jint color;
-		  jint stereo;
-		  jint depthBits;
-		  jint stencilBits;
-
-		  jint redBits;
-		  jint greenBits;
-		  jint blueBits;
-		  jint alphaBits;
-		  jint accumRedBits;
-		  jint accumGreenBits;
-		  jint accumBlueBits;
-		  jint accumAlphaBits;
+	LIBAPI char libGLName[/*800*/];
+	LIBAPI char libGLUName[/*800*/];
 
-		  jlong nativeVisualID;
-	  } GLCapabilities;
-		
 	/**
 	 * gets the capabilities outta java's GLCapabilities object 'capsObj'
 	 * and puts those values to the C-Struct GLCapabilities !
@@ -77,19 +43,10 @@
 						       GLCapabilities *glCaps );
 
 		
-	/**
-	 * prints the contents of the GLCapabilities to stdout !
-	 */
-	LIBAPI void LIBAPIENTRY printGLCapabilities ( GLCapabilities *glCaps );
-
 	/* testJavaGLTypes does important implementation plattformspecific checks:
 	 *
 	 * o do fit the JNI <-> GL Variables-Type Mapping 
 	 * o IF ERROR OR VERBOSE -> DUMP JNI,GL Type-Length
 	 */
 	LIBAPI jboolean LIBAPIENTRY testJavaGLTypes(jboolean verbose);
-	  
-	LIBAPI void * LIBAPIENTRY getGLProcAddressHelper
-				         (const char * func, int * method,
-					  int debug, int verbose );
 #endif