1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
| | From 53ce1153924061b52b2892a730e1ffa71b0b6b2b Mon Sep 17 00:00:00 2001
From: TakeV <disroot.org>
Date: Thu, 23 Feb 2023 13:53:12 -0800
Subject: [PATCH] Fix SDL paths for guix build
---
Makefile | 2 +-
src/audio.c | 4 ++--
src/boss.c | 2 +-
src/demon.c | 4 ++--
src/ending.c | 2 +-
src/gamemap.c | 2 +-
src/help.c | 2 +-
src/levelblit.c | 4 ++--
src/save.c | 2 +-
9 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/Makefile b/Makefile
index c48e460..d8f4fcd 100755
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
# You should have received a copy of the GNU General Public License
# along with Meritous. If not, see <http://www.gnu.org/licenses/>.
#
-LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz
+LDFLAGS = `sdl-config --libs` -lSDL_image -lSDL_mixer -lz -lpthread -lm
CCFLAGS = -O2 -Wall `sdl-config --cflags` -g
#
OBJS = src/levelblit.o \
diff --git a/src/audio.c b/src/audio.c
index 0e86dd2..d0e8a58 100755
--- a/src/audio.c
+++ b/src/audio.c
@@ -23,8 +23,8 @@
#include <stdlib.h>
#include <math.h>
#include <SDL.h>
-#include <SDL_image.h>
-#include <SDL_mixer.h>
+#include <SDL/SDL_image.h>
+#include <SDL/SDL_mixer.h>
#include <string.h>
#include "levelblit.h"
diff --git a/src/boss.c b/src/boss.c
index a1423cd..89e192a 100755
--- a/src/boss.c
+++ b/src/boss.c
@@ -25,7 +25,7 @@
#include <math.h>
#include <time.h>
#include <SDL.h>
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
#include "levelblit.h"
#include "mapgen.h"
diff --git a/src/demon.c b/src/demon.c
index e69ea70..8e4fd5e 100755
--- a/src/demon.c
+++ b/src/demon.c
@@ -22,8 +22,8 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
-#include <SDL.h>
-#include <SDL_image.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_image.h>
#include <assert.h>
#include "levelblit.h"
diff --git a/src/ending.c b/src/ending.c
index d759ab1..763d3e9 100755
--- a/src/ending.c
+++ b/src/ending.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <math.h>
#include <SDL.h>
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
#include <assert.h>
#include "levelblit.h"
diff --git a/src/gamemap.c b/src/gamemap.c
index 7c13bed..59cd47e 100755
--- a/src/gamemap.c
+++ b/src/gamemap.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <math.h>
#include <SDL.h>
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
#include "levelblit.h"
#include "mapgen.h"
diff --git a/src/help.c b/src/help.c
index cecc3fd..d47aa5f 100755
--- a/src/help.c
+++ b/src/help.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <math.h>
#include <SDL.h>
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
#include <string.h>
#include "levelblit.h"
diff --git a/src/levelblit.c b/src/levelblit.c
index edd3a35..9c43ec6 100755
--- a/src/levelblit.c
+++ b/src/levelblit.c
@@ -24,8 +24,8 @@
#include <string.h>
#include <math.h>
#include <time.h>
-#include <SDL.h>
-#include <SDL_image.h>
+#include <SDL/SDL.h>
+#include <SDL/SDL_image.h>
#include <assert.h>
#include "mapgen.h"
diff --git a/src/save.c b/src/save.c
index d7818d9..5b1a881 100755
--- a/src/save.c
+++ b/src/save.c
@@ -23,7 +23,7 @@
#include <stdlib.h>
#include <math.h>
#include <SDL.h>
-#include <SDL_image.h>
+#include <SDL/SDL_image.h>
#include <zlib.h>
#include "levelblit.h"
--
2.39.2
|