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

Collapse All | Expand All

(-)file_not_specified_in_diff (-10 / +50 lines)
Line  Link Here
0
-- Makefile
0
++ Makefile
Lines 1-27 Link Here
1
CC  = ccache gcc
1
CC  ?= gcc
2
CXX = ccache g++
2
CXX ?= g++
3
4
CXXFLAGS += -Wnon-virtual-dtor -Werror=return-type
5
6
CPPFLAGS += $(shell pkg-config --cflags sdl) \
7
	    -I/usr/include/boost \
8
	    -I/sw/include/SDL \
9
	    -Isrc/
10
LIBS += -lSDLmain \
11
	$(shell pkg-config --libs sdl) \
12
	$(shell pkg-config --libs glu) \
13
	$(shell pkg-config --libs glew) \
14
	$(shell pkg-config --libs SDL_image) \
15
	$(shell pkg-config --libs SDL_ttf) \
16
	$(shell pkg-config --libs SDL_mixer) \
17
	$(shell pkg-config --libs libpng)
18
19
LDFLAGS += -L/sw/lib \
20
	   -L/usr/lib \
21
	   -L.
3
22
4
OPT = -O2 -fno-inline-functions
5
23
6
include Makefile.common
24
include Makefile.common
7
25
8
%.o : src/%.cpp
26
%.o : src/%.cpp
9
	$(CXX) $(CCFLAGS) -DIMPLEMENT_SAVE_PNG -fno-inline-functions -g $(OPT) `sdl-config --cflags` -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Werror=return-type -fthreadsafe-statics -c $<
27
	$(CXX) \
28
		$(CXXFLAGS) -fno-inline-functions -fthreadsafe-statics $(CPPFLAGS) -DIMPLEMENT_SAVE_PNG \
29
		-c $<
10
30
11
game: $(objects)
31
game: $(objects)
12
	$(CXX) $(CCFLAGS) -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Werror=return-type $(objects) -o game -L. -L/sw/lib -L. -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lGLEW -lSDL_image -lSDL_ttf -lSDL_mixer -lpng -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
32
	$(CXX) \
33
		$(LDFLAGS) \
34
		$(CXXFLAGS) $(CPPFLAGS) \
35
		$(objects) -o game \
36
		$(LIBS) -lboost_regex-mt -lboost_system-mt -lpthread -fthreadsafe-statics
13
37
14
server: $(server_objects)
38
server: $(server_objects)
15
	$(CXX) -fno-inline-functions -g $(OPT) -D_GNU_SOURCE=1 -D_REENTRANT -Wnon-virtual-dtor -Werror=return-type -fthreadsafe-statics $(server_objects) -o server -L/sw/lib -L/usr/lib `sdl-config --libs` -lSDLmain -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
39
	$(CXX) \
40
		$(LDFLAGS) \
41
		$(CXXFLAGS) -fno-inline-functions -fthreadsafe-statics $(CPPFLAGS) \
42
		$(server_objects) -o server \
43
		$(LIBS) -lboost_regex-mt -lboost_system-mt -lboost_thread-mt -lboost_iostreams-mt
16
44
17
formula_test: $(formula_test_objects)
45
formula_test: $(formula_test_objects)
18
	$(CXX) -O2 -g -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_FORMULA -Wnon-virtual-dtor -Werror=return-type src/formula.cpp $(formula_test_objects) -o test -L/usr/lib -lSDL -lGL -lGLU -lSDL_image -lSDL_ttf -lSDL_mixer -lboost_regex
46
	$(CXX) \
47
		$(LDFLAGS) \
48
		$(CXXFLAGS) $(CPPFLAGS) -DUNIT_TEST_FORMULA \
49
		src/formula.cpp $(formula_test_objects) -o test \
50
		$(LIBS) -lboost_regex
19
51
20
wml_modify_test: $(wml_modify_test_objects)
52
wml_modify_test: $(wml_modify_test_objects)
21
	$(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_MODIFY -Wnon-virtual-dtor -Werror=return-type src/wml_modify.cpp $(wml_modify_test_objects) -o test -L/usr/lib -lboost_regex
53
	$(CXX) \
54
		$(LDFLAGS) \
55
		$(CXXFLAGS) -framework Cocoa $(CPPFLAGS) -DUNIT_TEST_WML_MODIFY \
56
		src/wml_modify.cpp $(wml_modify_test_objects) -o test \
57
		-lboost_regex
22
58
23
wml_schema_test: $(wml_schema_test_objects)
59
wml_schema_test: $(wml_schema_test_objects)
24
	$(CXX) -O2 -g -framework Cocoa -I/usr/local/include/boost-1_34 -I/sw/include/SDL -Isrc/ -I/usr/include/SDL -D_GNU_SOURCE=1 -D_REENTRANT -DUNIT_TEST_WML_SCHEMA -Wnon-virtual-dtor -Werror=return-type src/wml_schema.cpp $(wml_schema_test_objects) -o test -L/usr/lib -lboost_regex
60
	$(CXX) \
61
		$(LDFLAGS) \
62
		$(CXXFLAGS) -framework Cocoa $(CPPFLAGS) -DUNIT_TEST_WML_SCHEMA \
63
		src/wml_schema.cpp $(wml_schema_test_objects) -o test \
64
		-lboost_regex
25
65
26
update-pot:
66
update-pot:
27
	utils/make-pot.sh > po/frogatto.pot.bak
67
	utils/make-pot.sh > po/frogatto.pot.bak

Return to bug 417099