ALL: Merge the win32-contrib branch.
[vlc.git] / extras / contrib / src / Patches / libpng-1.2.5-win32.patch
1 diff -ur scripts/makefile.cygwin scripts/makefile.cygwin
2 --- scripts/makefile.cygwin     2002-10-03 12:32:34.000000000 +0100
3 +++ scripts/makefile.cygwin     2003-07-25 11:03:42.000000000 +0100
4 @@ -35,7 +35,7 @@
5  # $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
6  # list at the bottom of this makefile.
7  
8 -CC=gcc
9 +CC=i586-mingw32msvc-gcc
10  ifdef MINGW
11  MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
12  MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
13 @@ -43,13 +43,12 @@
14  
15  # Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
16  ifndef prefix
17 -prefix=/usr
18 -$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
19 +prefix=££PREFIX££
20  endif
21  
22  # Where the zlib library and include files are located
23 -ZLIBLIB= /usr/lib
24 -ZLIBINC=
25 +ZLIBLIB= ££PREFIX££/lib
26 +ZLIBINC= ££PREFIX££/include
27  #ZLIBLIB=../zlib
28  #ZLIBINC=../zlib
29  
30 @@ -94,7 +94,7 @@
31  LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
32  
33  MKDIR=/bin/mkdir -pv
34 -RANLIB=ranlib
35 +RANLIB=i586-mingw32msvc-ranlib
36  #RANLIB=echo
37  
38  INCPATH=$(prefix)/include
39 @@ -173,7 +173,7 @@
40         $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
41  
42  $(STATLIB): $(OBJS)
43 -       ar rc $@ $(OBJS)
44 +       i586-mingw32msvc-ar rc $@ $(OBJS)
45         $(RANLIB) $@
46  
47  $(SHAREDDEF): projects/msvc/png32ms.def