mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-26 05:49:00 +08:00
96edc8c4a3
* [freeglut] updated to 3.2.1
* [freeglut] address review comments
* [freeglut] add glut forwarding header
* [freeglut] revert incorrect wrapper location
* [freeglut] enable FREEGLUT_REPLACE_GLUT
* [freeglut] static lib renaming is not needed anymore
* [freeglut] revert FREEGLUT_REPLACE_GLUT setting, always use glut.h
* Revert "[freeglut] static lib renaming is not needed anymore"
This reverts commit 550018c1b8.
32 lines
1.4 KiB
Diff
32 lines
1.4 KiB
Diff
diff --git a/src/fg_gl2.h b/src/fg_gl2.h
|
|
index ab8ba5c..a1a52da 100644
|
|
--- a/src/fg_gl2.h
|
|
+++ b/src/fg_gl2.h
|
|
@@ -67,13 +67,19 @@ typedef void (APIENTRY *FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC) (GLuint index);
|
|
typedef void (APIENTRY *FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC) (GLuint);
|
|
typedef void (APIENTRY *FGH_PFNGLVERTEXATTRIBPOINTERPROC) (GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer);
|
|
|
|
-FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
|
-FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
|
-FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
|
-FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
|
-FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
|
-FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
|
-FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
|
+#if __GNUC__ > 9
|
|
+#define FG_ATTRIBUTE_COMMON __attribute__((__common__))
|
|
+#else
|
|
+#define FG_ATTRIBUTE_COMMON
|
|
+#endif
|
|
+
|
|
+FGH_PFNGLGENBUFFERSPROC FG_ATTRIBUTE_COMMON fghGenBuffers;
|
|
+FGH_PFNGLDELETEBUFFERSPROC FG_ATTRIBUTE_COMMON fghDeleteBuffers;
|
|
+FGH_PFNGLBINDBUFFERPROC FG_ATTRIBUTE_COMMON fghBindBuffer;
|
|
+FGH_PFNGLBUFFERDATAPROC FG_ATTRIBUTE_COMMON fghBufferData;
|
|
+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC FG_ATTRIBUTE_COMMON fghEnableVertexAttribArray;
|
|
+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC FG_ATTRIBUTE_COMMON fghDisableVertexAttribArray;
|
|
+FGH_PFNGLVERTEXATTRIBPOINTERPROC FG_ATTRIBUTE_COMMON fghVertexAttribPointer;
|
|
|
|
# endif
|
|
|