Merge pull request #151 from rib/wip/rib/android

Check __ANDROID__ define when guarding Android code
macos/v1.5.9
Emmanuele Bassi 7 years ago committed by GitHub
commit 3f1699b682
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/dispatch_common.c

@ -175,14 +175,14 @@
#ifdef __APPLE__ #ifdef __APPLE__
#define GLX_LIB "/opt/X11/lib/libGL.1.dylib" #define GLX_LIB "/opt/X11/lib/libGL.1.dylib"
#elif defined(ANDROID) #elif defined(__ANDROID__)
#define GLX_LIB "libGLESv2.so" #define GLX_LIB "libGLESv2.so"
#else #else
#define GLVND_GLX_LIB "libGLX.so.1" #define GLVND_GLX_LIB "libGLX.so.1"
#define GLX_LIB "libGL.so.1" #define GLX_LIB "libGL.so.1"
#endif #endif
#ifdef ANDROID #ifdef __ANDROID__
#define EGL_LIB "libEGL.so" #define EGL_LIB "libEGL.so"
#define GLES1_LIB "libGLESv1_CM.so" #define GLES1_LIB "libGLESv1_CM.so"
#define GLES2_LIB "libGLESv2.so" #define GLES2_LIB "libGLESv2.so"
@ -718,7 +718,7 @@ epoxy_get_core_proc_address(const char *name, int core_version)
{ {
#ifdef _WIN32 #ifdef _WIN32
int core_symbol_support = 11; int core_symbol_support = 11;
#elif defined(ANDROID) #elif defined(__ANDROID__)
/** /**
* All symbols must be resolved through eglGetProcAddress * All symbols must be resolved through eglGetProcAddress
* on Android * on Android

Loading…
Cancel
Save