| @@ -1,30 +1,48 @@ | | | @@ -1,30 +1,48 @@ |
1 | $NetBSD: patch-aa,v 1.2 2006/01/10 14:33:26 jmmv Exp $ | | 1 | $NetBSD: patch-aa,v 1.3 2011/11/29 06:17:57 sbd Exp $ |
2 | | | 2 | |
3 | --- Makefile.rules.orig 2005-01-12 14:34:18.000000000 +0100 | | 3 | Honor CFLAGS and LDFLAGS from pkgsrc. |
| | | 4 | |
| | | 5 | --- Makefile.rules.orig 2005-01-12 13:34:18.000000000 +0000 |
4 | +++ Makefile.rules | | 6 | +++ Makefile.rules |
5 | @@ -2,9 +2,9 @@ | | 7 | @@ -2,9 +2,9 @@ |
6 | SDL_CONFIG=sdl-config | | 8 | SDL_CONFIG=sdl-config |
7 | LIBS=`$(SDL_CONFIG) --libs` -mno-windows -mcygwin -lz -l$(OPENGL) | | 9 | LIBS=`$(SDL_CONFIG) --libs` -mno-windows -mcygwin -lz -l$(OPENGL) |
8 | | | 10 | |
9 | -CFLAGS=-g -Wall -I/usr/include -I/usr/local/include | | 11 | -CFLAGS=-g -Wall -I/usr/include -I/usr/local/include |
10 | -PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage | | 12 | -PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage |
11 | -OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE) | | 13 | -OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE) |
12 | +#CFLAGS=-g -Wall -I/usr/include -I/usr/local/include | | 14 | +#CFLAGS=-g -Wall -I/usr/include -I/usr/local/include |
13 | +#PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage | | 15 | +#PROFLAGS=-g -Wall -pg -fprofile-arcs -ftest-coverage |
14 | +#OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE) | | 16 | +#OPTFLAGS=-O3 -fno-strict-aliasing -fomit-frame-pointer -ffast-math -march=$(CPU) $(OPTIMIZE) |
15 | | | 17 | |
16 | OBJECTS=\ | | 18 | OBJECTS=\ |
17 | ppc_disasm.o\ | | 19 | ppc_disasm.o\ |
18 | @@ -89,10 +89,10 @@ release: default | | 20 | @@ -89,22 +89,22 @@ release: default |
19 | profiler: default | | 21 | profiler: default |
20 | | | 22 | |
21 | gcube: $(OBJECTS) gcube.o | | 23 | gcube: $(OBJECTS) gcube.o |
22 | - $(CC) $(CFLAGS) $^ -o $@ $(LIBS) | | 24 | - $(CC) $(CFLAGS) $^ -o $@ $(LIBS) |
23 | + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) | | 25 | + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) |
24 | | | 26 | |
25 | gcubedbg: $(OBJECTS) gcubedbg.o cpu_dbg.o | | 27 | gcubedbg: $(OBJECTS) gcubedbg.o cpu_dbg.o |
26 | - $(CC) $(CFLAGS) $^ -o $@ $(LIBS) | | 28 | - $(CC) $(CFLAGS) $^ -o $@ $(LIBS) |
27 | + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) | | 29 | + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ $(LIBS) |
28 | | | 30 | |
29 | bin2dol: bin2dol.c general.o | | 31 | bin2dol: bin2dol.c general.o |
30 | $(CC) $(CFLAGS) $^ -o $@ | | 32 | - $(CC) $(CFLAGS) $^ -o $@ |
| | | 33 | + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ |
| | | 34 | |
| | | 35 | tplx: tplx.o general.o |
| | | 36 | - $(CC) $(CFLAGS) $^ -o $@ |
| | | 37 | + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ |
| | | 38 | |
| | | 39 | thpview: thpview.o general.o jpeg_tools.o |
| | | 40 | - $(CC) $(CFLAGS) `$(SDL_CONFIG) --cflags` $^ -o $@ -ljpeg `$(SDL_CONFIG) --libs` |
| | | 41 | + $(CC) $(CFLAGS) $(LDFLAGS) `$(SDL_CONFIG) --cflags` $^ -o $@ -ljpeg `$(SDL_CONFIG) --libs` |
| | | 42 | |
| | | 43 | isopack: isopack.o general.o |
| | | 44 | - $(CC) $(CFLAGS) $^ -o $@ -lz |
| | | 45 | + $(CC) $(CFLAGS) $(LDFLAGS) $^ -o $@ -lz |
| | | 46 | |
| | | 47 | ppc_disasm.o: ppc_disasm.c |
| | | 48 | $(CC) -g -c -o $@ $< |