Skip to content

Commit 157ff57

Browse files
AMDmi3AMDmi3
committed
Improve build system, respect CC, CFLAGS, DESTDIR, PREFIX
1 parent 5dc958f commit 157ff57

File tree

6 files changed

+91
-73
lines changed

6 files changed

+91
-73
lines changed

‎makefile

Lines changed: 37 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,45 @@
1-
all: griel
1+
PREFIX?= /usr
22

3-
griel: ./src/main.c ./src/history.c ./src/intro.c ./src/game.c ./src/hud.c ./src/hero.c ./src/loading.c ./src/ending.c
4-
gcc -finline-functions -funswitch-loops -fpredictive-commoning -fgcse-after-reload -ftree-vectorize ./src/main.c src/history.c ./src/intro.c ./src/game.c ./src/hud.c ./src/hero.c ./src/loading.c ./src/ending.c -o griels `sdl-config --cflags --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lm
3+
CC?= gcc
4+
CFLAGS?= -O2 -finline-functions -funswitch-loops -fpredictive-commoning -fgcse-after-reload -ftree-vectorize
5+
6+
CFLAGS+= `sdl-config --cflags` -DDATADIR="\"$(PREFIX)/share/griels\""
7+
LIBS= `sdl-config --libs` -lSDL_image -lSDL_ttf -lSDL_mixer -lSDL_gfx -lm
8+
9+
PROG= griels
10+
SRCS= src/ending.c \
11+
src/game.c \
12+
src/hero.c \
13+
src/history.c \
14+
src/hud.c \
15+
src/intro.c \
16+
src/loading.c \
17+
src/main.c
18+
19+
all: $(PROG)
20+
21+
$(PROG): $(SRCS)
22+
$(CC) $(CFLAGS) $(SRCS) -o $(PROG) $(LIBS)
523

624
clean:
7-
rm -f griels
25+
rm -f $(PROG)
826

927
# Installation
1028
install:
11-
cp griels /usr/bin/
12-
cp griels.desktop /usr/share/applications
13-
mkdir -p /usr/share/griels/music
14-
cp ./music/* /usr/share/griels/music
15-
mkdir -p /usr/share/griels/fx
16-
cp ./fx/* /usr/share/griels/fx
17-
mkdir -p /usr/share/griels/data
18-
cp ./data/* /usr/share/griels/data
19-
mkdir -p /usr/share/griels/png
20-
cp ./png/* /usr/share/griels/png
21-
cp ./png/icon.png /usr/share/pixmaps/griels.png
29+
cp $(PROG) $(DESTDIR)$(PREFIX)/bin/
30+
cp griels.desktop $(DESTDIR)$(PREFIX)/share/applications
31+
mkdir -p $(DESTDIR)$(PREFIX)/share/griels/music
32+
cp ./music/* $(DESTDIR)$(PREFIX)/share/griels/music
33+
mkdir -p $(DESTDIR)$(PREFIX)/share/griels/fx
34+
cp ./fx/* $(DESTDIR)$(PREFIX)/share/griels/fx
35+
mkdir -p $(DESTDIR)$(PREFIX)/share/griels/data
36+
cp ./data/* $(DESTDIR)$(PREFIX)/share/griels/data
37+
mkdir -p $(DESTDIR)$(PREFIX)/share/griels/png
38+
cp ./png/* $(DESTDIR)$(PREFIX)/share/griels/png
39+
cp ./png/icon.png $(DESTDIR)$(PREFIX)/share/pixmaps/griels.png
2240

2341
uninstall:
24-
rm /usr/bin/griels
25-
rm /usr/share/applications/griels.desktop
26-
rm /usr/share/pixmaps/griels.png
27-
rm -rf /usr/share/griels
42+
rm $(DESTDIR)$(PREFIX)/bin/$(PROG)
43+
rm $(DESTDIR)$(PREFIX)/share/applications/griels.desktop
44+
rm $(DESTDIR)$(PREFIX)/share/pixmaps/griels.png
45+
rm -rf $(DESTDIR)$(PREFIX)/share/griels

‎src/ending.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,23 +21,23 @@ void ending (SDL_Surface *screen, uint *state) {
2121
int framerate = 0;
2222

2323
/* Loading files */
24-
temp = IMG_Load("/usr/share/griels/png/blackbox2.png");
24+
temp = IMG_Load(DATADIR "/png/blackbox2.png");
2525
blackbox = SDL_DisplayFormat(temp);
2626
SDL_FreeSurface(temp);
27-
temp = IMG_Load("/usr/share/griels/png/ending1.png");
27+
temp = IMG_Load(DATADIR "/png/ending1.png");
2828
ending1 = SDL_DisplayFormat(temp);
2929
SDL_FreeSurface(temp);
30-
temp = IMG_Load("/usr/share/griels/png/ending2.png");
30+
temp = IMG_Load(DATADIR "/png/ending2.png");
3131
ending2 = SDL_DisplayFormat(temp);
3232
SDL_FreeSurface(temp);
33-
temp = IMG_Load("/usr/share/griels/png/ending3.png");
33+
temp = IMG_Load(DATADIR "/png/ending3.png");
3434
ending3 = SDL_DisplayFormat(temp);
3535
SDL_FreeSurface(temp);
36-
temp = IMG_Load("/usr/share/griels/png/theend.png");
36+
temp = IMG_Load(DATADIR "/png/theend.png");
3737
ending4 = SDL_DisplayFormat(temp);
3838
SDL_FreeSurface(temp);
39-
argh = Mix_LoadWAV("/usr/share/griels/fx/fx_uaaah.ogg");
40-
bso = Mix_LoadMUS("/usr/share/griels/music/ending.ogg");
39+
argh = Mix_LoadWAV(DATADIR "/fx/fx_uaaah.ogg");
40+
bso = Mix_LoadMUS(DATADIR "/music/ending.ogg");
4141

4242
SDL_Rect srcending = {0,0,512,448};
4343
SDL_Rect destending = {0,0,512,448};

‎src/game.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -52,60 +52,60 @@ void game (SDL_Surface *screen, uint *state, uint *level) {
5252
uint fullscreench = 0;
5353

5454
/* load files */
55-
temp = IMG_Load("/usr/share/griels/png/round.png");
55+
temp = IMG_Load(DATADIR "/png/round.png");
5656
roundscreen = SDL_DisplayFormat(temp);
5757
SDL_FreeSurface(temp);
58-
temp = IMG_Load("/usr/share/griels/png/blocks.png");
58+
temp = IMG_Load(DATADIR "/png/blocks.png");
5959
blocks = SDL_DisplayFormatAlpha(temp);
6060
SDL_FreeSurface(temp);
61-
temp = IMG_Load("/usr/share/griels/png/gamehead.png");
61+
temp = IMG_Load(DATADIR "/png/gamehead.png");
6262
headgame = SDL_DisplayFormat(temp);
6363
SDL_FreeSurface(temp);
64-
temp = IMG_Load("/usr/share/griels/png/fonts.png");
64+
temp = IMG_Load(DATADIR "/png/fonts.png");
6565
fonts = SDL_DisplayFormatAlpha(temp);
6666
SDL_FreeSurface(temp);
67-
temp = IMG_Load("/usr/share/griels/png/blackbox.png");
67+
temp = IMG_Load(DATADIR "/png/blackbox.png");
6868
blackbox = SDL_DisplayFormat(temp);
6969
window = SDL_DisplayFormat(temp);
7070
SDL_FreeSurface(temp);
71-
temp = IMG_Load("/usr/share/griels/png/gameover.png");
71+
temp = IMG_Load(DATADIR "/png/gameover.png");
7272
gameoverscreen = SDL_DisplayFormat(temp);
7373
SDL_FreeSurface(temp);
74-
temp = IMG_Load("/usr/share/griels/png/passw1.png");
74+
temp = IMG_Load(DATADIR "/png/passw1.png");
7575
passscreen01 = SDL_DisplayFormat(temp);
7676
SDL_FreeSurface(temp);
77-
temp = IMG_Load("/usr/share/griels/png/passw2.png");
77+
temp = IMG_Load(DATADIR "/png/passw2.png");
7878
passscreen02 = SDL_DisplayFormat(temp);
7979
SDL_FreeSurface(temp);
80-
temp = IMG_Load("/usr/share/griels/png/passw3.png");
80+
temp = IMG_Load(DATADIR "/png/passw3.png");
8181
passscreen03 = SDL_DisplayFormat(temp);
8282
SDL_FreeSurface(temp);
83-
temp = IMG_Load("/usr/share/griels/png/passw4.png");
83+
temp = IMG_Load(DATADIR "/png/passw4.png");
8484
passscreen04 = SDL_DisplayFormat(temp);
8585
SDL_FreeSurface(temp);
86-
temp = IMG_Load("/usr/share/griels/png/passw5.png");
86+
temp = IMG_Load(DATADIR "/png/passw5.png");
8787
passscreen05 = SDL_DisplayFormat(temp);
8888
SDL_FreeSurface(temp);
89-
temp = IMG_Load("/usr/share/griels/png/passw6.png");
89+
temp = IMG_Load(DATADIR "/png/passw6.png");
9090
passscreen06 = SDL_DisplayFormat(temp);
9191
SDL_FreeSurface(temp);
92-
temp = IMG_Load("/usr/share/griels/png/passw7.png");
92+
temp = IMG_Load(DATADIR "/png/passw7.png");
9393
passscreen07 = SDL_DisplayFormat(temp);
9494
SDL_FreeSurface(temp);
95-
temp = IMG_Load("/usr/share/griels/png/passw8.png");
95+
temp = IMG_Load(DATADIR "/png/passw8.png");
9696
passscreen08 = SDL_DisplayFormat(temp);
9797
SDL_FreeSurface(temp);
98-
temp = IMG_Load("/usr/share/griels/png/passw9.png");
98+
temp = IMG_Load(DATADIR "/png/passw9.png");
9999
passscreen09 = SDL_DisplayFormat(temp);
100100
SDL_FreeSurface(temp);
101-
temp = IMG_Load("/usr/share/griels/png/passw10.png");
101+
temp = IMG_Load(DATADIR "/png/passw10.png");
102102
passscreen10 = SDL_DisplayFormat(temp);
103103
SDL_FreeSurface(temp);
104-
stageclear = Mix_LoadWAV("/usr/share/griels/music/stageclear.ogg");
105-
gameover = Mix_LoadMUS("/usr/share/griels/music/gameover.ogg");
106-
giveup = Mix_LoadWAV("/usr/share/griels/fx/fx_giveup.ogg");
107-
key = Mix_LoadWAV("/usr/share/griels/fx/fx_key.ogg");
108-
kill = Mix_LoadWAV("/usr/share/griels/fx/fx_kill.ogg");
104+
stageclear = Mix_LoadWAV(DATADIR "/music/stageclear.ogg");
105+
gameover = Mix_LoadMUS(DATADIR "/music/gameover.ogg");
106+
giveup = Mix_LoadWAV(DATADIR "/fx/fx_giveup.ogg");
107+
key = Mix_LoadWAV(DATADIR "/fx/fx_key.ogg");
108+
kill = Mix_LoadWAV(DATADIR "/fx/fx_kill.ogg");
109109

110110
/* load map data */
111111
loaddata(map);

‎src/history.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,20 @@ void history (SDL_Surface *screen, uint *state) {
3838
SDL_Rect destsent4 = {28,168,200,8};
3939

4040
/* Loading files */
41-
temp = IMG_Load("/usr/share/griels/png/blackbox.png");
41+
temp = IMG_Load(DATADIR "/png/blackbox.png");
4242
blackbox = SDL_DisplayFormat(temp);
4343
SDL_FreeSurface(temp);
44-
temp = IMG_Load("/usr/share/griels/png/blackbox.png");
44+
temp = IMG_Load(DATADIR "/png/blackbox.png");
4545
window = SDL_DisplayFormat(temp);
4646
SDL_FreeSurface(temp);
47-
temp = IMG_Load("/usr/share/griels/png/howtoplay.png");
47+
temp = IMG_Load(DATADIR "/png/howtoplay.png");
4848
pictures = SDL_DisplayFormat(temp);
4949
SDL_FreeSurface(temp);
50-
temp = IMG_Load("/usr/share/griels/png/texts.png");
50+
temp = IMG_Load(DATADIR "/png/texts.png");
5151
texts = SDL_DisplayFormatAlpha(temp);
5252
SDL_FreeSurface(temp);
53-
bso = Mix_LoadMUS("/usr/share/griels/music/history.ogg");
54-
lol = Mix_LoadWAV("/usr/share/griels/fx/fx_hahaha.ogg");
53+
bso = Mix_LoadMUS(DATADIR "/music/history.ogg");
54+
lol = Mix_LoadWAV(DATADIR "/fx/fx_hahaha.ogg");
5555

5656
/* Loop */
5757
while (*state == 1) {

‎src/intro.c

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -24,40 +24,40 @@ void game_intro (SDL_Surface *screen, uint *state, uint *level) {
2424
SDL_Event keystroke;
2525

2626
/* Load files */
27-
temp = IMG_Load("/usr/share/griels/png/blackbox.png");
27+
temp = IMG_Load(DATADIR "/png/blackbox.png");
2828
blackbox = SDL_DisplayFormat(temp);
2929
SDL_FreeSurface(temp);
30-
temp = IMG_Load("/usr/share/griels/png/karoshi.png");
30+
temp = IMG_Load(DATADIR "/png/karoshi.png");
3131
karoshi = SDL_DisplayFormat(temp);
3232
SDL_FreeSurface(temp);
33-
temp = IMG_Load("/usr/share/griels/png/blackbox.png");
33+
temp = IMG_Load(DATADIR "/png/blackbox.png");
3434
window = SDL_DisplayFormat(temp);
3535
SDL_FreeSurface(temp);
36-
temp = IMG_Load("/usr/share/griels/png/startscreen.png");
36+
temp = IMG_Load(DATADIR "/png/startscreen.png");
3737
startscreen = SDL_DisplayFormat(temp);
3838
SDL_FreeSurface(temp);
39-
temp = IMG_Load("/usr/share/griels/png/startinfo.png");
39+
temp = IMG_Load(DATADIR "/png/startinfo.png");
4040
startinfo = SDL_DisplayFormat(temp);
4141
SDL_FreeSurface(temp);
42-
temp = IMG_Load("/usr/share/griels/png/blocks.png");
42+
temp = IMG_Load(DATADIR "/png/blocks.png");
4343
blocks = SDL_DisplayFormat(temp);
4444
SDL_FreeSurface(temp);
45-
temp = IMG_Load("/usr/share/griels/png/menu.png");
45+
temp = IMG_Load(DATADIR "/png/menu.png");
4646
menu = SDL_DisplayFormat(temp);
4747
SDL_FreeSurface(temp);
48-
temp = IMG_Load("/usr/share/griels/png/fonts.png");
48+
temp = IMG_Load(DATADIR "/png/fonts.png");
4949
arrow = SDL_DisplayFormatAlpha(temp);
5050
SDL_FreeSurface(temp);
51-
temp = IMG_Load("/usr/share/griels/png/password.png");
51+
temp = IMG_Load(DATADIR "/png/password.png");
5252
passwords = SDL_DisplayFormatAlpha(temp);
5353
SDL_FreeSurface(temp);
54-
temp = IMG_Load("/usr/share/griels/png/fonts.png");
54+
temp = IMG_Load(DATADIR "/png/fonts.png");
5555
fonts = SDL_DisplayFormatAlpha(temp);
5656
SDL_FreeSurface(temp);
57-
start = Mix_LoadWAV("/usr/share/griels/fx/fx_start.ogg");
58-
poff = Mix_LoadWAV("/usr/share/griels/fx/fx_poff.ogg");
59-
error = Mix_LoadWAV("/usr/share/griels/fx/fx_error.ogg");
60-
ding = Mix_LoadWAV("/usr/share/griels/fx/fx_ding.ogg");
57+
start = Mix_LoadWAV(DATADIR "/fx/fx_start.ogg");
58+
poff = Mix_LoadWAV(DATADIR "/fx/fx_poff.ogg");
59+
error = Mix_LoadWAV(DATADIR "/fx/fx_error.ogg");
60+
ding = Mix_LoadWAV(DATADIR "/fx/fx_ding.ogg");
6161

6262
SDL_Rect srcscreen = {0,0,256,224};
6363
SDL_Rect destscreen = {0,0,256,224};

‎src/loading.c

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ void loaddata (int map[][11][16]) {
77
uint i = 0;
88
uint j = 0;
99
uint k = 0;
10-
FILE *datafile = fopen("/usr/share/griels/data/rounds.txt", "r");
10+
FILE *datafile = fopen(DATADIR "/data/rounds.txt", "r");
1111
char line[49];
1212
char temp[3];
1313
temp[2] = 0;
@@ -33,15 +33,15 @@ void loaddata (int map[][11][16]) {
3333
void load_music(Mix_Music *bsogame, int round) {
3434

3535
if ((round == 0) || (round == 5) || (round == 10) || (round == 15) || (round == 20) || (round == 25) || (round == 30) || (round == 35) || (round == 40) || (round == 45) || (round == 50) || (round == 55))
36-
bsogame = Mix_LoadMUS("/usr/share/griels/music/stage1.ogg");
36+
bsogame = Mix_LoadMUS(DATADIR "/music/stage1.ogg");
3737
if ((round == 1) || (round == 6) || (round == 11) || (round == 16) || (round == 21) || (round == 26) || (round == 31) || (round == 36) || (round == 41) || (round == 46) || (round == 51) || (round == 56))
38-
bsogame = Mix_LoadMUS("/usr/share/griels/music/stage2.ogg");
38+
bsogame = Mix_LoadMUS(DATADIR "/music/stage2.ogg");
3939
if ((round == 2) || (round == 7) || (round == 12) || (round == 17) || (round == 22) || (round == 27) || (round == 32) || (round == 37) || (round == 42) || (round == 47) || (round == 52) || (round == 57))
40-
bsogame = Mix_LoadMUS("/usr/share/griels/music/stage3.ogg");
40+
bsogame = Mix_LoadMUS(DATADIR "/music/stage3.ogg");
4141
if ((round == 3) || (round == 8) || (round == 13) || (round == 18) || (round == 23) || (round == 28) || (round == 33) || (round == 38) || (round == 43) || (round == 48) || (round == 53))
42-
bsogame = Mix_LoadMUS("/usr/share/griels/music/stage4.ogg");
42+
bsogame = Mix_LoadMUS(DATADIR "/music/stage4.ogg");
4343
if ((round == 4) || (round == 9) || (round == 14) || (round == 19) || (round == 24) || (round == 29) || (round == 34) || (round == 39) || (round == 44) || (round == 49) || (round == 54))
44-
bsogame = Mix_LoadMUS("/usr/share/griels/music/stage5.ogg");
44+
bsogame = Mix_LoadMUS(DATADIR "/music/stage5.ogg");
4545

4646
Mix_PlayMusic(bsogame, -1);
4747

0 commit comments

Comments
 (0)