diff options
| author | Dan Gudmundsson <[email protected]> | 2010-10-11 11:00:38 +0200 |
|---|---|---|
| committer | Dan Gudmundsson <[email protected]> | 2010-11-15 10:13:07 +0100 |
| commit | 8577598667bff43f503f3cae87934c3e9918d135 (patch) | |
| tree | 7769951ae687f9c266ee938f0df221e291699529 /lib/wx/c_src/egl_impl.h | |
| parent | ac433c8318566261a74ffe7fd0824fb99610bed3 (diff) | |
| download | otp-8577598667bff43f503f3cae87934c3e9918d135.tar.gz otp-8577598667bff43f503f3cae87934c3e9918d135.tar.bz2 otp-8577598667bff43f503f3cae87934c3e9918d135.zip | |
Windows and Mac build issues
Diffstat (limited to 'lib/wx/c_src/egl_impl.h')
| -rw-r--r-- | lib/wx/c_src/egl_impl.h | 37 |
1 files changed, 17 insertions, 20 deletions
diff --git a/lib/wx/c_src/egl_impl.h b/lib/wx/c_src/egl_impl.h index 60be2c41d2..5909ebd96e 100644 --- a/lib/wx/c_src/egl_impl.h +++ b/lib/wx/c_src/egl_impl.h @@ -25,11 +25,20 @@ # include <dlfcn.h> #endif -#ifndef __WXMAC__ -# include <GL/gl.h> -# include <GL/glu.h> /* Header File For The OpenGL Library */ -#else -# include <OpenGL/glu.h> /* Header File For The OpenGL Library */ +#ifdef _WIN32 +#include <windows.h> +#include <gl/gl.h> +#include <gl/glu.h> +#elif defined(HAVE_GL_GL_H) +#include <GL/gl.h> +# include <GL/glu.h> +#elif defined(HAVE_OPENGL_GL_H) +#include <OpenGL/gl.h> +#include <OpenGL/glu.h> +#endif + +#ifndef APIENTRY +#define APIENTRY #endif #ifndef CALLBACK @@ -51,18 +60,6 @@ # define GLUfuncptr GLvoid (*)() #endif -#ifdef WIN32 -#include <windows.h> -#include <gl/gl.h> -#elif defined(HAVE_GL_GL_H) -#include <GL/gl.h> -#elif defined(HAVE_OPENGL_GL_H) -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif - /* Some new GL types (eliminates the need for glext.h) */ #ifndef HAVE_GLINTPTR @@ -131,10 +128,10 @@ typedef uint64_t GLuint64EXT; /* External Api */ #ifdef _WIN32 -__declspec(dllexport) int egl_init_opengl(); -__declspec(dllexport) void egl_dispatch(int, char *, ErlDrvPort, ErlDrvTermData, char **); +extern "C" __declspec(dllexport) int egl_init_opengl(void *); +extern "C" __declspec(dllexport) void egl_dispatch(int, char *, ErlDrvPort, ErlDrvTermData, char **); #else -extern "C" int egl_init_opengl(); +extern "C" int egl_init_opengl(void *); extern "C" void egl_dispatch(int, char *, ErlDrvPort, ErlDrvTermData, char **); #endif |