From bc35d622adb0965652955b6517c17b19f41fd41f Mon Sep 17 00:00:00 2001 From: Simon Robertshaw <simon@hardwired.org.uk> Date: Mon, 4 Jun 2012 12:21:07 +0100 Subject: [PATCH] OpenGL JNI Canvas compiled only when needed --- src/powdertoyjava/OpenGLCanvasMacOS.h | 2 ++ src/powdertoyjava/OpenGLCanvasMacOS.mm | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/powdertoyjava/OpenGLCanvasMacOS.h b/src/powdertoyjava/OpenGLCanvasMacOS.h index 3f3d68f63..cee495a8e 100644 --- a/src/powdertoyjava/OpenGLCanvasMacOS.h +++ b/src/powdertoyjava/OpenGLCanvasMacOS.h @@ -1,3 +1,4 @@ +#ifdef USE_JNI #import <jawt_md.h> #import <Cocoa/Cocoa.h> @@ -30,4 +31,5 @@ extern "C" { JNIEXPORT void JNICALL Java_OpenGLCanvas_releaseOpenGL(JNIEnv *env, jobject canvas); #ifdef __cplusplus } +#endif #endif \ No newline at end of file diff --git a/src/powdertoyjava/OpenGLCanvasMacOS.mm b/src/powdertoyjava/OpenGLCanvasMacOS.mm index 009c32e21..c169c5f39 100644 --- a/src/powdertoyjava/OpenGLCanvasMacOS.mm +++ b/src/powdertoyjava/OpenGLCanvasMacOS.mm @@ -1,3 +1,4 @@ +#ifdef USE_JNI #include "OpenGLCanvasMacOS.h" static jfieldID ctxID = NULL; @@ -164,4 +165,5 @@ JNIEXPORT void JNICALL Java_OpenGLCanvas_releaseOpenGL(JNIEnv *env, jobject canv } freeContext(env, canvas, ci); -} \ No newline at end of file +} +#endif \ No newline at end of file