]>
Commit | Line | Data |
---|---|---|
f8f613ab | 1 | --- libpng-1.2.19/scripts/makefile.gcmmx~ 2007-08-18 12:33:48.000000000 +0200 |
2 | +++ libpng-1.2.19/scripts/makefile.gcmmx 2007-08-19 00:46:42.000000000 +0200 | |
3 | @@ -45,8 +45,8 @@ | |
4 | # Where the zlib library and include files are located. | |
8b8a90e5 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: | |
f8f613ab | 14 | @@ -60,8 +60,8 @@ |
c333c4d3 | 15 | |
8b8a90e5 JB |
16 | # Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety |
17 | ### for generic gcc: | |
f8f613ab | 18 | -CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \ |
19 | - $(ALIGN) -funroll-loops \ | |
c333c4d3 | 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: | |
f8f613ab | 24 | #CFLAGS=-DPNG_THREAD_UNSAFE_OK -I$(ZLIBINC) -Wall -O \ |
25 | --- libpng-1.2.19/scripts/makefile.linux~ 2007-08-18 12:33:48.000000000 +0200 | |
26 | +++ libpng-1.2.19/scripts/makefile.linux 2007-08-19 00:49:15.000000000 +0200 | |
27 | @@ -34,8 +34,8 @@ | |
28 | # Where the zlib library and include files are located. | |
8b8a90e5 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: | |
f8f613ab | 38 | @@ -47,7 +47,7 @@ |
8b8a90e5 JB |
39 | |
40 | # for pgcc version 2.95.1, -O3 is buggy; don't use it. | |
41 | ||
f8f613ab | 42 | -CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops -DPNG_NO_MMX_CODE \ |
8b8a90e5 JB |
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 |