diff options
| author | Sven Gothel <[email protected]> | 2008-06-24 20:08:47 +0000 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2008-06-24 20:08:47 +0000 |
| commit | 381d6874d9a9d944e91952509212ce16cd054a26 (patch) | |
| tree | bd945343235ede4e64430fc5a118b4ef0efaa917 /make/stub_includes | |
| parent | a8d2e240c2d843562500b68bb3f0f4434044f2f1 (diff) | |
generate OS dependent native code in a separate directory
git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1673 232f8b59-042b-4e1e-8c03-345bb8c30851
Diffstat (limited to 'make/stub_includes')
| -rwxr-xr-x | make/stub_includes/common/gles2.c | 2 | ||||
| -rwxr-xr-x | make/stub_includes/opengl/GLES2/gl2.h | 26 |
2 files changed, 19 insertions, 9 deletions
diff --git a/make/stub_includes/common/gles2.c b/make/stub_includes/common/gles2.c index d0b44a46f..f74b1686f 100755 --- a/make/stub_includes/common/gles2.c +++ b/make/stub_includes/common/gles2.c @@ -1,4 +1,4 @@ -#define GLAPI +#define GL_APIENTRY #define GL_APICALL // Define GL_GLEXT_PROTOTYPES so that the OpenGL extension prototypes in diff --git a/make/stub_includes/opengl/GLES2/gl2.h b/make/stub_includes/opengl/GLES2/gl2.h index 172c5adb0..9c68b1e7a 100755 --- a/make/stub_includes/opengl/GLES2/gl2.h +++ b/make/stub_includes/opengl/GLES2/gl2.h @@ -43,27 +43,37 @@ extern "C" { * Definition of GL_APICALL and GL_APIENTRY *-----------------------------------------------------------------------*/ -/* -#if defined(_WIN32) || defined(__VC32__) // Win32 +#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) +#define __WIN32__ +#endif + +#if !defined(GL_APICALL) +# if !defined(OPENSTEP) && (defined(__WIN32__) && !defined(__CYGWIN__)) # if defined (_DLL_EXPORTS) # define GL_APICALL __declspec(dllexport) # else # define GL_APICALL __declspec(dllimport) # endif -#elif defined (__ARMCC_VERSION) // ADS +# define GL_APIENTRY __stdcall +# elif defined (__ARMCC_VERSION) // ADS # define GL_APICALL -#elif defined (__SYMBIAN32__) && defined (__GCC32__) // Symbian GCC +# define GL_APIENTRY +# elif defined (__SYMBIAN32__) && defined (__GCC32__) // Symbian GCC # define GL_APICALL __declspec(dllexport) -#elif defined (__GNUC__) // GCC dependencies (kludge) -# define GL_APICALL +# define GL_APIENTRY +# else +# define GL_APICALL extern +# define GL_APIENTRY +# endif #endif #if !defined (GL_APICALL) # error Unsupported platform! #endif -*/ -#define GL_APIENTRY +#if (defined(__BEOS__) && defined(__POWERPC__)) || defined(__QUICKDRAW__) +# define PRAGMA_EXPORT_SUPPORTED 1 +#endif /*------------------------------------------------------------------------- * Data type definitions |