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