From 409b14fb6227e59a452051d93480a4b55f484aa7 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Fri, 8 Jan 2016 01:33:08 +0000 Subject: [PATCH] jwzgles: fix errors when compiling on Linux git-svn-id: https://svn.eduke32.com/eduke32@5523 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/build/include/jwzglesI.h | 2 +- polymer/eduke32/build/src/jwzgles.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/polymer/eduke32/build/include/jwzglesI.h b/polymer/eduke32/build/include/jwzglesI.h index d784d786b..f8114553d 100644 --- a/polymer/eduke32/build/include/jwzglesI.h +++ b/polymer/eduke32/build/include/jwzglesI.h @@ -344,7 +344,7 @@ extern GLenum jwzgles_glGetError(); extern const GLubyte * jwzgles_glGetString(GLenum name); -typedef float GLclampd; +// typedef float GLclampd; extern void jwzgles_glReadPixels (GLint x, GLint y, GLsizei width, GLsizei height, GLenum format, GLenum type, GLvoid *pixels); extern void jwzgles_glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/polymer/eduke32/build/src/jwzgles.c b/polymer/eduke32/build/src/jwzgles.c index af63ec789..5761fdb2e 100644 --- a/polymer/eduke32/build/src/jwzgles.c +++ b/polymer/eduke32/build/src/jwzgles.c @@ -103,7 +103,7 @@ #undef countof #define countof(x) (signed)((signed)sizeof((x))/(signed)sizeof((*x))) -#ifndef USE_IPHONE +#ifdef __ANDROID__ #include #define LOG_TAG "JWZGLES" #define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__) @@ -115,13 +115,13 @@ #ifdef HAVE_COCOA extern void jwxyz_abort (const char *fmt, ...) __dead2; # define Assert(C,S) do { if (!(C)) { jwxyz_abort ("%s",S); }} while(0) -#elif defined USE_IPHONE -# define Assert(C,S) -#else +#elif defined __ANDROID__ # define Assert(C,S) do { \ if (!(C)) { \ LOGE ( "ASSERT jwzgles: %s\n", S); \ }} while(0) +#else +# define Assert(C,S) #endif