]>
Commit | Line | Data |
---|---|---|
c501f448 JB |
1 | --- libpng-1.2.31/scripts/makefile.gcmmx.orig 2008-08-21 12:54:14.000000000 +0200 |
2 | +++ libpng-1.2.31/scripts/makefile.gcmmx 2008-08-23 01:23:37.018625344 +0200 | |
3 | @@ -43,8 +43,8 @@ | |
6c18cf9d | 4 | # Where the zlib library and include files are located. |
4ef53418 JB |
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: | |
c501f448 | 14 | @@ -58,8 +58,8 @@ |
da84fb67 | 15 | |
4ef53418 JB |
16 | # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety |
17 | ### for generic gcc: | |
c501f448 | 18 | -CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \ |
6c18cf9d | 19 | - $(ALIGN) -funroll-loops \ |
c501f448 | 20 | +CFLAGS=-DPNG_USE_PNGGCCRC -I$(ZLIBINC) -W -Wall \ |
e286c0e4 | 21 | + $(OPT_FLAGS) $(ALIGN) \ |
4ef53418 JB |
22 | -fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5 |
23 | ### for gcc 2.95.2 on 686: | |
c501f448 JB |
24 | #CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -W -Wall -O \ |
25 | --- libpng-1.2.31/scripts/makefile.linux.orig 2008-08-21 12:54:14.000000000 +0200 | |
26 | +++ libpng-1.2.31/scripts/makefile.linux 2008-08-23 01:26:41.342625344 +0200 | |
27 | @@ -35,8 +35,8 @@ | |
6c18cf9d | 28 | # Where the zlib library and include files are located. |
4ef53418 JB |
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: | |
c501f448 | 38 | @@ -48,7 +48,7 @@ |
4ef53418 JB |
39 | |
40 | # for pgcc version 2.95.1, -O3 is buggy; don't use it. | |
41 | ||
c501f448 JB |
42 | -CFLAGS=-I$(ZLIBINC) -W -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ |
43 | +CFLAGS=-I$(ZLIBINC) -W -Wall $(OPT_FLAGS) -DPNG_NO_MMX_CODE \ | |
4ef53418 | 44 | $(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5 |
4ef53418 | 45 | |
da84fb67 | 46 | LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm |