Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 261773 | Differences between
and this patch

Collapse All | Expand All

(-)build/linux/Makefile.old (-19 / +16 lines)
Lines 1-15 Link Here
1
EXE = f1spirit
1
EXE = f1spirit
2
SRC = sources
2
SRC = sources
3
PREFIX = /usr
3
PREFIX = $(DESTDIR)/usr
4
EXTRADIR = ./build/linux
4
EXTRADIR = ./build/linux
5
5
6
GAMEDIR = $(PREFIX)/games
6
GAMEDIR = $(PREFIX)/games/bin
7
STARTUP = $(GAMEDIR)/$(EXE)
7
STARTUP = $(GAMEDIR)/$(EXE)
8
BINDIR = $(PREFIX)/share/games/$(EXE)
8
BINDIR = $(PREFIX)/games/bin
9
ICNDIR = $(PREFIX)/share/pixmaps
9
ICNDIR = $(PREFIX)/share/pixmaps
10
APPDIR = $(PREFIX)/share/applications
10
APPDIR = $(PREFIX)/share/applications
11
DATADIR = $(PREFIX)/share/games/$(EXE)
11
12
12
DATA = demos graphics tracks sound readme.txt f1spirit2.cfg
13
DATA = demos graphics tracks sound f1spirit2.cfg
13
ICON = f1spirit.png
14
ICON = f1spirit.png
14
DESKTOP = f1spirit.desktop
15
DESKTOP = f1spirit.desktop
15
16
Lines 40-53 Link Here
40
41
41
CC = gcc
42
CC = gcc
42
#CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
43
#CFLAGS = -g3 -O3 -Wall `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
43
CFLAGS = -g3 -O3 `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
44
CFLAGS += `sdl-config --cflags` `curl-config --cflags` -I/usr/X11R6/include
44
LDFLAGS = `sdl-config --libs` `curl-config --libs` -L/usr/X11R6/lib/ -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU
45
LIBS = `sdl-config --libs` `curl-config --libs` -lSDL_image -lSDL_mixer -lSDL_net -lGL -lGLU
46
LDFLAGS += -L/usr/X11R6/lib/
45
RM = rm -f
47
RM = rm -f
46
CP = cp -r
48
CP = cp -r
47
MD = mkdir -p
49
MD = mkdir -p
48
ECHO = echo
50
ECHO = echo
49
CHMOD = chmod
51
CHMOD = chmod
50
STRIP = strip
52
STRIP = echo 
51
53
52
all: $(EXE)
54
all: $(EXE)
53
55
Lines 55-61 Link Here
55
	$(CC) $(CFLAGS) -c $< -o $@
57
	$(CC) $(CFLAGS) -c $< -o $@
56
58
57
$(EXE): $(OBJS)
59
$(EXE): $(OBJS)
58
	$(CC) $(LDFLAGS) $^ -o $@
60
	$(CC) $(LDFLAGS) $^ -o $@ $(LIBS)
59
	@$(STRIP) $@
61
	@$(STRIP) $@
60
	@$(ECHO) " o If there are no errors, the game compiled succesfully"
62
	@$(ECHO) " o If there are no errors, the game compiled succesfully"
61
63
Lines 64-82 Link Here
64
	@$(RM) $(SRC)/*.o $(SRC)/*.bak core $(EXE)
66
	@$(RM) $(SRC)/*.o $(SRC)/*.bak core $(EXE)
65
67
66
install: all
68
install: all
67
	@$(ECHO) " o Creating install directory $(BINDIR)"
69
	@$(ECHO) " o Creating install directories"
68
	@$(MD) "$(BINDIR)"
70
	@$(MD) "$(DATADIR)"
69
	@$(ECHO) " o Installing game and data to $(BINDIR)"
71
	@$(ECHO) " o Installing game to $(DATADIR)"
70
	@$(CP) "$(EXE)" $(DATA) "$(BINDIR)"
72
	@$(CP) "$(EXE)" "$(DATADIR)"
71
	@$(ECHO) " o Creating startup script $(STARTUP)"
73
	@$(ECHO) " o Installing data to $(DATADIR)"
72
	@$(MD) "$(GAMEDIR)"
74
	@$(CP) $(DATA) "$(DATADIR)"
73
	@$(ECHO) "cd \"$(BINDIR)\"; ./$(EXE); cd -" >"$(STARTUP)"
74
	@$(CHMOD) 755 "$(STARTUP)"
75
	@$(ECHO) " o Creating application menu entry"
76
	@$(MD) "$(ICNDIR)"
75
	@$(MD) "$(ICNDIR)"
77
	@$(CP) "$(EXTRADIR)/$(ICON)" "$(ICNDIR)"
76
	@$(CP) "$(EXTRADIR)/$(ICON)" "$(ICNDIR)"
78
	@$(MD) "$(APPDIR)"
79
	@$(CP) "$(EXTRADIR)/$(DESKTOP)" "$(APPDIR)"
80
	@$(ECHO) ""
77
	@$(ECHO) ""
81
78
82
uninstall:
79
uninstall:

Return to bug 261773