summaryrefslogtreecommitdiff
path: root/thirdparty/glad/KHR
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2019-07-11 10:11:40 +0200
committerRémi Verschelde <rverschelde@gmail.com>2019-07-11 10:36:32 +0200
commit2bbcc521b63acc3c380fc98d07adf8a8720edeb7 (patch)
treefdfaf4402907aeafe7ac03a3dd690216ec63abb4 /thirdparty/glad/KHR
parent49ce6bacc338d4279c121e13d4c7434d4318e4e4 (diff)
glad: Sync with upstream 0.1.31
Diffstat (limited to 'thirdparty/glad/KHR')
-rw-r--r--thirdparty/glad/KHR/khrplatform.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/thirdparty/glad/KHR/khrplatform.h b/thirdparty/glad/KHR/khrplatform.h
index 975bbffed6..5b55ea2b98 100644
--- a/thirdparty/glad/KHR/khrplatform.h
+++ b/thirdparty/glad/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