git.sesse.net Git - vlc/blob - extras/contrib/src/Patches/libpng-win32.patch

   1 --- scripts/makefile.cygwin     2004-12-03 00:14:31.000000000 +0000
   2 +++ scripts/makefile.cygwin     2006-04-09 17:56:32.203125000 +0100
   3 @@ -35,7 +35,6 @@
   4  # $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
   5  # list at the bottom of this makefile.
   6
   7 -CC=gcc
   8  ifdef MINGW
   9  MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
  10  MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
  11 @@ -43,13 +42,12 @@
  12
  13  # Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
  14  ifndef prefix
  15 -prefix=/usr
  16 -$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
  17 +prefix=??PREFIX??
  18  endif
  19
  20  # Where the zlib library and include files are located
  21 -ZLIBLIB= /usr/lib
  22 -ZLIBINC=
  23 +ZLIBLIB= ??PREFIX??/lib
  24 +ZLIBINC= ??PREFIX??/include
  25  #ZLIBLIB=../zlib
  26  #ZLIBINC=../zlib
  27
  28 @@ -94,7 +92,9 @@
  29  LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
  30
  31  MKDIR=/bin/mkdir -pv
  32 +ifndef RANLIB
  33  RANLIB=ranlib
  34 +endif
  35  #RANLIB=echo
  36
  37  INCPATH=$(prefix)/include
  38 @@ -173,10 +173,10 @@
  39         $(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
  40
  41  $(STATLIB): $(OBJS)
  42 -       ar rc $@ $(OBJS)
  43 +       $(AR) rc $@ $(OBJS)
  44         $(RANLIB) $@
  45
  46 -$(SHAREDDEF): scripts/png32ms.def
  47 +$(SHAREDDEF): scripts/pngw32.def
  48         cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
  49         sed -e 's/\([^;]*\);/;/' > $@
  50