diff options
| author | bunnei <bunneidev@gmail.com> | 2019-05-24 18:23:04 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-24 18:23:04 -0400 |
| commit | c70404eab5ad77c48c1b6a0a573e08aad404dafa (patch) | |
| tree | d75e35ef022d217ae4e166311761e5d111b91cbb /externals/glad/include/KHR/khrplatform.h | |
| parent | b6dcb1ae4d95b8fe83357709526ed07c9b923652 (diff) | |
| parent | f4c15db9e8641579b196a13e2a8f130490669c9c (diff) | |
Merge pull request #2505 from ReinUsesLisp/glad-update
externals: Update glad to support OpenGL 4.6 compatibility profile
Diffstat (limited to 'externals/glad/include/KHR/khrplatform.h')
| -rw-r--r-- | externals/glad/include/KHR/khrplatform.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/externals/glad/include/KHR/khrplatform.h b/externals/glad/include/KHR/khrplatform.h index 975bbffed..5b55ea2b9 100644 --- a/externals/glad/include/KHR/khrplatform.h +++ b/externals/glad/include/KHR/khrplatform.h @@ -90,12 +90,20 @@ * int arg2) KHRONOS_APIATTRIBUTES; */ +#if defined(__SCITECH_SNAP__) && !defined(KHRONOS_STATIC) +# define KHRONOS_STATIC 1 +#endif + /*------------------------------------------------------------------------- * Definition of KHRONOS_APICALL *------------------------------------------------------------------------- * This precedes the return type of the function in the function prototype. */ -#if defined(_WIN32) && !defined(__SCITECH_SNAP__) +#if defined(KHRONOS_STATIC) + /* If the preprocessor constant KHRONOS_STATIC is defined, make the + * header compatible with static linking. */ +# define KHRONOS_APICALL +#elif defined(_WIN32) # define KHRONOS_APICALL __declspec(dllimport) #elif defined (__SYMBIAN32__) # define KHRONOS_APICALL IMPORT_C @@ -111,7 +119,7 @@ * This follows the return type of the function and precedes the function * name in the function prototype. */ -#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(__SCITECH_SNAP__) +#if defined(_WIN32) && !defined(_WIN32_WCE) && !defined(KHRONOS_STATIC) /* Win32 but not WinCE */ # define KHRONOS_APIENTRY __stdcall #else |