67 lines
2.6 KiB
Diff
67 lines
2.6 KiB
Diff
From 33349b6cebcca0ac9db79177c046fa153c073470 Mon Sep 17 00:00:00 2001
|
|
Message-Id: <33349b6cebcca0ac9db79177c046fa153c073470.1580897265.git.mjg@fedoraproject.org>
|
|
From: Michael J Gruber <mjg@fedoraproject.org>
|
|
Date: Wed, 5 Feb 2020 11:07:38 +0100
|
|
Subject: [PATCH] fix build with gcc 10
|
|
|
|
gcc 10 uses -fno-common by default, so that mupdf fails to build: the
|
|
linker raises "multiple definition" errors the the definitions in
|
|
fg_gl2.h which were supposed to be declarations. Mark them as such and
|
|
move the definition to fg_gl2.c.
|
|
|
|
Signed-off-by: Michael J Gruber <mjg@fedoraproject.org>
|
|
---
|
|
src/fg_gl2.c | 10 ++++++++++
|
|
src/fg_gl2.h | 14 +++++++-------
|
|
2 files changed, 17 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/src/fg_gl2.c b/src/fg_gl2.c
|
|
index 38b0acb..a9ccdf1 100644
|
|
--- a/src/fg_gl2.c
|
|
+++ b/src/fg_gl2.c
|
|
@@ -27,6 +27,16 @@
|
|
#include "fg_internal.h"
|
|
#include "fg_gl2.h"
|
|
|
|
+#ifndef GL_ES_VERSION_2_0
|
|
+FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
|
+FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
|
+FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
|
+FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
|
+FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
|
+FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
|
+FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
|
+#endif
|
|
+
|
|
void FGAPIENTRY glutSetVertexAttribCoord3(GLint attrib) {
|
|
if (fgStructure.CurrentWindow != NULL)
|
|
fgStructure.CurrentWindow->Window.attribute_v_coord = attrib;
|
|
diff --git a/src/fg_gl2.h b/src/fg_gl2.h
|
|
index ab8ba5c..fb3d467 100644
|
|
--- a/src/fg_gl2.h
|
|
+++ b/src/fg_gl2.h
|
|
@@ -67,13 +67,13 @@ 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;
|
|
+extern FGH_PFNGLGENBUFFERSPROC fghGenBuffers;
|
|
+extern FGH_PFNGLDELETEBUFFERSPROC fghDeleteBuffers;
|
|
+extern FGH_PFNGLBINDBUFFERPROC fghBindBuffer;
|
|
+extern FGH_PFNGLBUFFERDATAPROC fghBufferData;
|
|
+extern FGH_PFNGLENABLEVERTEXATTRIBARRAYPROC fghEnableVertexAttribArray;
|
|
+extern FGH_PFNGLDISABLEVERTEXATTRIBARRAYPROC fghDisableVertexAttribArray;
|
|
+extern FGH_PFNGLVERTEXATTRIBPOINTERPROC fghVertexAttribPointer;
|
|
|
|
# endif
|
|
|
|
--
|
|
2.25.0.231.gf1b37f75f4
|
|
|