git.iko.soy/flathub
on not-tetris-2 help sign in
flathub/love-buildfix.patch
108 lines 3.6 kB history raw
1diff --git a/src/Makefile.am b/src/Makefile.am
2index 53ef0a6..0663211 100644
3--- a/src/Makefile.am
4+++ b/src/Makefile.am
5@@ -1,4 +1,4 @@
6-AM_CPPFLAGS = -I. -I./modules -I/usr/include/AL -I/usr/include/freetype2 $(INCLUDE_LUA) -I/usr/include/SDL $(FILE_OFFSET)
7+AM_CPPFLAGS = -I. -I./modules -I/usr/include/AL -I/usr/include/freetype2 $(INCLUDE_LUA) -I/app/include/SDL $(FILE_OFFSET)
8 AUTOMAKE_OPTIONS = subdir-objects
9 DEFAULT_INCLUDES =
10 SUBDIRS =
11@@ -366,4 +366,4 @@ love_SOURCES = \
12 ./common/Exception.h \
13 ./common/Exception.cpp \
14 ./common/EnumMap.h \
15-./common/Data.h
16\ No newline at end of file
17+./common/Data.h
18diff --git a/src/Makefile.in b/src/Makefile.in
19index 391bb6f..f95dd99 100644
20--- a/src/Makefile.in
21+++ b/src/Makefile.in
22@@ -393,7 +393,7 @@ target_alias = @target_alias@
23 top_build_prefix = @top_build_prefix@
24 top_builddir = @top_builddir@
25 top_srcdir = @top_srcdir@
26-AM_CPPFLAGS = -I. -I./modules -I/usr/include/AL -I/usr/include/freetype2 $(INCLUDE_LUA) -I/usr/include/SDL $(FILE_OFFSET)
27+AM_CPPFLAGS = -I. -I./modules -I/usr/include/AL -I/usr/include/freetype2 $(INCLUDE_LUA) -I/app/include/SDL $(FILE_OFFSET)
28 AUTOMAKE_OPTIONS = subdir-objects
29 DEFAULT_INCLUDES =
30 SUBDIRS =
31diff --git a/src/modules/font/freetype/Font.h b/src/modules/font/freetype/Font.h
32index a98778f..d8ad364 100644
33--- a/src/modules/font/freetype/Font.h
34+++ b/src/modules/font/freetype/Font.h
35@@ -26,14 +26,14 @@
37 // FreeType2
38 #ifdef LOVE_MACOSX
39-#include <freetype/ft2build.h>
40+#include <freetype2/freetype/ft2build.h>
41 #else
42 #include <ft2build.h>
43 #endif
44-#include <freetype/freetype.h>
45-#include <freetype/ftglyph.h>
46-#include <freetype/ftoutln.h>
47-#include <freetype/fttrigon.h>
48+#include <freetype2/freetype/freetype.h>
49+#include <freetype2/freetype/ftglyph.h>
50+#include <freetype2/freetype/ftoutln.h>
51+#include <freetype2/freetype/fttrigon.h>
53 namespace love
54 {
55diff --git a/src/modules/font/freetype/TrueTypeRasterizer.h b/src/modules/font/freetype/TrueTypeRasterizer.h
56index 6fc13db..7393bc2 100644
57--- a/src/modules/font/freetype/TrueTypeRasterizer.h
58+++ b/src/modules/font/freetype/TrueTypeRasterizer.h
59@@ -27,10 +27,10 @@
61 // TrueType2
62 #include <ft2build.h>
63-#include <freetype/freetype.h>
64-#include <freetype/ftglyph.h>
65-#include <freetype/ftoutln.h>
66-#include <freetype/fttrigon.h>
67+#include <freetype2/freetype/freetype.h>
68+#include <freetype2/freetype/ftglyph.h>
69+#include <freetype2/freetype/ftoutln.h>
70+#include <freetype2/freetype/fttrigon.h>
72 namespace love
73 {
74diff --git a/src/modules/graphics/opengl/Framebuffer.cpp b/src/modules/graphics/opengl/Framebuffer.cpp
75index 93575d7..ea36807 100644
76--- a/src/modules/graphics/opengl/Framebuffer.cpp
77+++ b/src/modules/graphics/opengl/Framebuffer.cpp
78@@ -1,3 +1,5 @@
79+#define GL_GLEXT_PROTOTYPES
81 #include "Framebuffer.h"
82 #include <common/Matrix.h>
84diff --git a/src/modules/graphics/opengl/GLee.h b/src/modules/graphics/opengl/GLee.h
85index 34ca16b..dd3aa2c 100644
86--- a/src/modules/graphics/opengl/GLee.h
87+++ b/src/modules/graphics/opengl/GLee.h
88@@ -67,6 +67,7 @@
89 #define GLX_GLXEXT_PROTOTYPES
90 #include <GL/gl.h>
91 #include <GL/glx.h>
92+typedef XID GLXContextID;
93 #endif
95 #ifndef APIENTRY
96diff --git a/src/modules/graphics/opengl/SpriteBatch.cpp b/src/modules/graphics/opengl/SpriteBatch.cpp
97index ca5762f..7a2e57a 100644
98--- a/src/modules/graphics/opengl/SpriteBatch.cpp
99+++ b/src/modules/graphics/opengl/SpriteBatch.cpp
100@@ -18,6 +18,8 @@
101 * 3. This notice may not be removed or altered from any source distribution.
102 **/
104+#define GL_GLEXT_PROTOTYPES
106 #include "SpriteBatch.h"
108 // STD