[packages/crossmingw32-libpng.git] / libpng-opt.patch

diff -urN libpng-1.0.9.org/scripts/makefile.gcmmx libpng-1.0.9/scripts/makefile.gcmmx
--- libpng-1.0.9.org/scripts/makefile.gcmmx	Thu Feb  1 15:22:46 2001
+++ libpng-1.0.9/scripts/makefile.gcmmx	Thu Feb  1 15:26:38 2001
@@ -17,8 +17,8 @@
 # Where the zlib library and include files are located
 #ZLIBLIB=/usr/local/lib
 #ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
+ZLIBLIB=/usr/lib
+ZLIBINC=
 
 ALIGN=
 # for i386:
@@ -31,7 +31,7 @@
 # for pgcc version 2.95.1, -O3 is buggy; don't use it.
 
 ### for generic gcc:
-CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
+CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall $(OPT_FLAGS) $(ALIGN) -funroll-loops \
 	-fomit-frame-pointer  # $(WARNMORE) -g -DPNG_DEBUG=5
 ### for gcc 2.95.2 on 686:
 #CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \
diff -urN libpng-1.0.9.org/scripts/makefile.linux libpng-1.0.9/scripts/makefile.linux
--- libpng-1.0.9.org/scripts/makefile.linux	Thu Feb  1 15:22:46 2001
+++ libpng-1.0.9/scripts/makefile.linux	Thu Feb  1 15:25:49 2001
@@ -11,8 +11,8 @@
 # Where the zlib library and include files are located
 #ZLIBLIB=/usr/local/lib
 #ZLIBINC=/usr/local/include
-ZLIBLIB=../zlib
-ZLIBINC=../zlib
+ZLIBLIB=/usr/lib
+ZLIBINC=
 
 ALIGN=
 # for i386:
@@ -24,7 +24,7 @@
 
 # for pgcc version 2.95.1, -O3 is buggy; don't use it.
 
-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
+CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
 LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
Commit	Line	Data
38addf72 AM	1	diff -urN libpng-1.0.9.org/scripts/makefile.gcmmx libpng-1.0.9/scripts/makefile.gcmmx
	2	--- libpng-1.0.9.org/scripts/makefile.gcmmx Thu Feb 1 15:22:46 2001
	3	+++ libpng-1.0.9/scripts/makefile.gcmmx Thu Feb 1 15:26:38 2001
	4	@@ -17,8 +17,8 @@
5d54cad8	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:
38addf72 AM	15	@@ -31,7 +31,7 @@
38addf72 AM	16	# for pgcc version 2.95.1, -O3 is buggy; don't use it.
17117aaf	17
38addf72 AM	18	### for generic gcc:
	19	-CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 $(ALIGN) -funroll-loops \
	20	+CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall $(OPT_FLAGS) $(ALIGN) -funroll-loops \
	21	-fomit-frame-pointer # $(WARNMORE) -g -DPNG_DEBUG=5
	22	### for gcc 2.95.2 on 686:
	23	#CFLAGS=-DPNG_USE_PNGGCCRD -I$(ZLIBINC) -Wall -O3 \
	24	diff -urN libpng-1.0.9.org/scripts/makefile.linux libpng-1.0.9/scripts/makefile.linux
	25	--- libpng-1.0.9.org/scripts/makefile.linux Thu Feb 1 15:22:46 2001
	26	+++ libpng-1.0.9/scripts/makefile.linux Thu Feb 1 15:25:49 2001
	27	@@ -11,8 +11,8 @@
bca8f078	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:
38addf72	38	@@ -24,7 +24,7 @@
bca8f078	39
	40	# for pgcc version 2.95.1, -O3 is buggy; don't use it.
	41
38addf72 AM	42	-CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
	43	+CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
	44	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
bca8f078	45	LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
bca8f078	46