]>
Commit | Line | Data |
---|---|---|
c333c4d3 AF |
1 | --- libpng-1.2.2/scripts/makefile.gcmmx.wiget Mon Apr 15 16:25:45 2002 |
2 | +++ libpng-1.2.2/scripts/makefile.gcmmx Tue Apr 16 15:54:12 2002 | |
3 | @@ -27,8 +27,8 @@ | |
8b8a90e5 JB |
4 | # Where the zlib library and include files are located |
5 | #ZLIBLIB=/usr/local/lib | |
6 | #ZLIBINC=/usr/local/include | |
7 | -ZLIBLIB=../zlib | |
8 | -ZLIBINC=../zlib | |
9 | +ZLIBLIB=/usr/lib | |
10 | +ZLIBINC= | |
11 | ||
12 | ALIGN= | |
13 | # for i386: | |
c333c4d3 AF |
14 | @@ -42,8 +42,8 @@ |
15 | ||
8b8a90e5 JB |
16 | # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety |
17 | ### for generic gcc: | |
18 | -CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \ | |
c333c4d3 AF |
19 | - -O3 $(ALIGN) -funroll-loops \ |
20 | +CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall \ | |
2a90d85a | 21 | + $(OPT_FLAGS) $(ALIGN) \ |
8b8a90e5 JB |
22 | -fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5 |
23 | ### for gcc 2.95.2 on 686: | |
24 | #CFLAGS=-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \ | |
c333c4d3 AF |
25 | --- libpng-1.2.2/scripts/makefile.linux.wiget Mon Apr 15 16:25:46 2002 |
26 | +++ libpng-1.2.2/scripts/makefile.linux Tue Apr 16 15:48:37 2002 | |
27 | @@ -17,8 +17,8 @@ | |
8b8a90e5 JB |
28 | # Where the zlib library and include files are located |
29 | #ZLIBLIB=/usr/local/lib | |
30 | #ZLIBINC=/usr/local/include | |
31 | -ZLIBLIB=../zlib | |
32 | -ZLIBINC=../zlib | |
33 | +ZLIBLIB=/usr/lib | |
34 | +ZLIBINC= | |
35 | ||
36 | ALIGN= | |
37 | # for i386: | |
c333c4d3 | 38 | @@ -30,7 +30,7 @@ |
8b8a90e5 JB |
39 | |
40 | # for pgcc version 2.95.1, -O3 is buggy; don't use it. | |
41 | ||
42 | -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \ | |
43 | +CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \ | |
44 | $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 | |
8b8a90e5 | 45 | |
c333c4d3 | 46 | LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm |