blob: a4fe02efe2d1801330d143255297ceb21554d226 (
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
72
73
74
|
diff -ru --no-dereference goonies-1.4.1528-orig/build/linux/Makefile goonies-1.4.1528/build/linux/Makefile
--- goonies-1.4.1528-orig/build/linux/Makefile 2017-09-15 16:03:14.354828140 +0200
+++ goonies-1.4.1528/build/linux/Makefile 2017-09-15 16:03:40.794490393 +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
@@ -56,9 +56,9 @@
$(SRC)/Symbol.o $(SRC)/TheGooniesApp.o \
$(SRC)/TheGoonies.o $(SRC)/Vector.o
-CC = gcc
-CFLAGS = -g3 -O3 -Wno-write-strings `sdl-config --cflags` -I/usr/X11R6/include
-LDFLAGS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
+CC = g++
+CXXFLAGS += -Wno-write-strings `sdl-config --cflags` -I/usr/X11R6/include
+LIBS = `sdl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lGL -lGLU
RM = rm -f
CP = cp -r
MD = mkdir -p
@@ -69,11 +69,10 @@
all: $(EXE)
%.o: %.cpp
- $(CC) $(CFLAGS) -c $< -o $@
+ $(CC) $(CPPFLAGS) $(CXXFLAGS) -c $< -o $@
$(EXE): $(OBJS)
- $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@
- @$(STRIP) $@
+ $(CC) $(LIBS) $(LDFLAGS) $^ -o $@
@$(ECHO) " o If there are no errors, the game compiled succesfully"
clean:
@@ -83,12 +82,16 @@
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) "#!/bin/sh" >"$(STARTUP)"
- @$(ECHO) "cd \"$(BINDIR)\" && ./$(EXE)" >>"$(STARTUP)"
+ @$(ECHO) "cd \"/usr/share/goonies/\" && /lib/$(EXE)/$(EXE)" >>"$(STARTUP)"
+# @$(ECHO) "cd \"$(BINDIR)\" && ./$(EXE)" >>"$(STARTUP)"
@$(CHMOD) 755 "$(STARTUP)"
@$(ECHO) " o Creating application menu entry"
@$(MD) "$(ICNDIR)"
diff -ru --no-dereference goonies-1.4.1528-orig/src/auxiliar.cpp goonies-1.4.1528/src/auxiliar.cpp
--- goonies-1.4.1528-orig/src/auxiliar.cpp 2017-09-15 16:03:14.254829415 +0200
+++ goonies-1.4.1528/src/auxiliar.cpp 2017-09-15 16:03:19.948090140 +0200
@@ -94,7 +94,7 @@
if (tmp == 0 ||
mask == 0)
- return false;
+ return 0;
res = SDL_DisplayFormatAlpha(tmp);
|