blob: 9f65f622743af74ee7496af5913de29c798aaf22 (
plain)
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
|
diff -ru --no-dereference roadfighter-1.0.1269-orig/build/linux/Makefile roadfighter-1.0.1269/build/linux/Makefile
--- roadfighter-1.0.1269-orig/build/linux/Makefile 2017-09-15 15:22:05.852622638 +0200
+++ roadfighter-1.0.1269/build/linux/Makefile 2017-09-15 15:22:46.405478548 +0200
@@ -3,9 +3,9 @@
PREFIX = /usr
EXTRADIR = ./build/linux
-GAMEDIR = $(PREFIX)/games
+GAMEDIR = $(PREFIX)/bin
STARTUP = $(GAMEDIR)/$(EXE)
-BINDIR = $(PREFIX)/share/games/$(EXE)
+BINDIR = $(PREFIX)/share/$(EXE)
ICNDIR = $(PREFIX)/share/pixmaps
APPDIR = $(PREFIX)/share/applications
@@ -37,8 +37,8 @@
$(SRC)/main.o
CC = g++
-CFLAGS = -g3 -O3 `sdl-config --cflags` -I/usr/X11R6/include
-LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
+CXXFLAGS += `sdl-config --cflags` -I/usr/X11R6/include
+LIBS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_sound -lSDL_ttf
RM = rm -f
CP = cp -r
MD = mkdir -p
@@ -49,11 +49,10 @@
all: $(EXE)
%.o: %.cpp
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CC) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
$(EXE): $(OBJS)
- $(CC) $(LDFLAGS) $^ -o $@
- @$(STRIP) $@
+ $(CC) $(LIBS) $(LDFLAGS) $^ -o $@
@$(ECHO) " o If there are no errors, the game compiled succesfully"
clean:
@@ -63,11 +62,15 @@
install: all
@$(ECHO) " o Creating install directory $(BINDIR)"
@$(MD) "$(BINDIR)"
- @$(ECHO) " o Installing game and data to $(BINDIR)"
- @$(CP) "$(EXE)" $(DATA) "$(BINDIR)"
+ @$(ECHO) " o Installing data to $(BINDIR)"
+ @$(CP) $(DATA) "$(BINDIR)"
+ @$(ECHO) " o Installing binary to $(PREFIX)/lib/$(EXE)"
+ @$(MD) "$(PREFIX)/lib/$(EXE)"
+ @$(CP) "$(EXE)" "$(PREFIX)/lib/$(EXE)"
@$(ECHO) " o Creating startup script $(STARTUP)"
@$(MD) "$(GAMEDIR)"
- @$(ECHO) "cd \"$(BINDIR)\"; ./$(EXE); cd -" >"$(STARTUP)"
+ @$(ECHO) "cd \"/usr/share/roadfighter/\"; /lib/$(EXE)/$(EXE); cd -" >"$(STARTUP)"
+# @$(ECHO) "cd \"$(BINDIR)\"; ./$(EXE); cd -" >"$(STARTUP)"
@$(CHMOD) 755 "$(STARTUP)"
@$(ECHO) " o Creating application menu entry"
@$(MD) "$(ICNDIR)"
diff -ru --no-dereference roadfighter-1.0.1269-orig/src/auxiliar.cpp roadfighter-1.0.1269/src/auxiliar.cpp
--- roadfighter-1.0.1269-orig/src/auxiliar.cpp 2017-09-15 15:22:05.819289694 +0200
+++ roadfighter-1.0.1269/src/auxiliar.cpp 2017-09-15 15:22:20.002457087 +0200
@@ -84,7 +84,7 @@
mask=IMG_Load(name);
if (tmp==0 ||
- mask==0) return false;
+ mask==0) return 0;
res=SDL_DisplayFormatAlpha(tmp);
|