mirror of
https://github.com/ZDoom/raze-gles.git
synced 2025-01-12 03:00:38 +00:00
jwzgles: fix errors when compiling on Linux
git-svn-id: https://svn.eduke32.com/eduke32@5523 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
parent
8cd708cef4
commit
409b14fb62
2 changed files with 5 additions and 5 deletions
|
@ -344,7 +344,7 @@ extern GLenum jwzgles_glGetError();
|
||||||
extern const GLubyte * jwzgles_glGetString(GLenum name);
|
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_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);
|
extern void jwzgles_glCopyTexSubImage2D (GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height);
|
||||||
|
|
|
@ -103,7 +103,7 @@
|
||||||
#undef countof
|
#undef countof
|
||||||
#define countof(x) (signed)((signed)sizeof((x))/(signed)sizeof((*x)))
|
#define countof(x) (signed)((signed)sizeof((x))/(signed)sizeof((*x)))
|
||||||
|
|
||||||
#ifndef USE_IPHONE
|
#ifdef __ANDROID__
|
||||||
#include <android/log.h>
|
#include <android/log.h>
|
||||||
#define LOG_TAG "JWZGLES"
|
#define LOG_TAG "JWZGLES"
|
||||||
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
|
#define LOGD(...) __android_log_print(ANDROID_LOG_DEBUG,LOG_TAG,__VA_ARGS__)
|
||||||
|
@ -115,13 +115,13 @@
|
||||||
#ifdef HAVE_COCOA
|
#ifdef HAVE_COCOA
|
||||||
extern void jwxyz_abort (const char *fmt, ...) __dead2;
|
extern void jwxyz_abort (const char *fmt, ...) __dead2;
|
||||||
# define Assert(C,S) do { if (!(C)) { jwxyz_abort ("%s",S); }} while(0)
|
# define Assert(C,S) do { if (!(C)) { jwxyz_abort ("%s",S); }} while(0)
|
||||||
#elif defined USE_IPHONE
|
#elif defined __ANDROID__
|
||||||
# define Assert(C,S)
|
|
||||||
#else
|
|
||||||
# define Assert(C,S) do { \
|
# define Assert(C,S) do { \
|
||||||
if (!(C)) { \
|
if (!(C)) { \
|
||||||
LOGE ( "ASSERT jwzgles: %s\n", S); \
|
LOGE ( "ASSERT jwzgles: %s\n", S); \
|
||||||
}} while(0)
|
}} while(0)
|
||||||
|
#else
|
||||||
|
# define Assert(C,S)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue