blob: 6a1b161eeadc3b678fefd1559df38d87eb3cd2e0 (
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
|
Use correct CXX, CXXFLAGS, LDFLAGS
Bug: https://bugs.gentoo.org/933592
Bug: https://bugs.gentoo.org/933591
Bug: https://bugs.gentoo.org/933590
--- i/Makefile
+++ w/Makefile
@@ -1,28 +1,26 @@
-CC=g++
-CCFLAGS=-O2 -Wall
CFILES=game.cpp gamestate.cpp gui.cpp image.cpp main.cpp panel.cpp player.cpp resources.cpp screen.cpp sector.cpp sound.cpp tutorial.cpp utils.cpp TinyXML/tinyxml.cpp TinyXML/tinyxmlerror.cpp TinyXML/tinyxmlparser.cpp
HFILES=game.h gamestate.h gui.h image.h panel.h player.h resources.h screen.h sector.h sound.h tutorial.h utils.h common.h stdafx.h TinyXML/tinyxml.h
OFILES=game.o gamestate.o gui.o image.o panel.o player.o resources.o screen.o sector.o sound.o tutorial.o utils.o main.o TinyXML/tinyxml.o TinyXML/tinyxmlerror.o TinyXML/tinyxmlparser.o
APP=gigalomania
INC=`sdl2-config --cflags`
LINKPATH=`sdl2-config --libs` -L/usr/X11R6/lib/ -L/usr/lib
LIBS=-lSDL2_image -lSDL2_mixer
all: $(APP)
$(APP): $(OFILES) $(HFILES) $(CFILES)
- $(CC) $(OFILES) $(CCFLAGS) $(LINKPATH) $(LIBS) -o $(APP)
+ $(CXX) $(OFILES) ${CXXFLAGS} ${LDFLAGS} $(LINKPATH) $(LIBS) -o $(APP)
.cpp.o:
- $(CC) $(CCFLAGS) -O2 $(INC) -c $< -o $@
+ $(CXX) ${CXXFLAGS} ${LDFLAGS} $(INC) -c $< -o $@
# REMEMBER to update debian/dirs if the system directories that we use are changed!!!
install: $(APP)
mkdir -p $(DESTDIR)/opt/gigalomania # -p so we don't fail if folder already exists
cp $(APP) $(DESTDIR)/opt/gigalomania
cp readme.html $(DESTDIR)/opt/gigalomania
cp -a gfx/ $(DESTDIR)/opt/gigalomania # -a need to copy permissions etc
cp -a islands/ $(DESTDIR)/opt/gigalomania
cp -a music/ $(DESTDIR)/opt/gigalomania
cp -a sound/ $(DESTDIR)/opt/gigalomania
|
