X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=arch%2Fwin32%2Fmakedeps.sh;h=cc8a8bf45cb1a26567bc4c3c4bb4d7162cd0097c;hp=49a79e1f054bbb9ad9c3e3b0a8169adfd03c8703;hb=6027c0a2e74057bcbec27e56f1a7434418038297;hpb=8c6a82feb045ac859b344cd7665a36ac00f4949e

diff --git a/arch/win32/makedeps.sh b/arch/win32/makedeps.sh
index 49a79e1..cc8a8bf 100755
--- a/arch/win32/makedeps.sh
+++ b/arch/win32/makedeps.sh
@@ -17,16 +17,15 @@
 # downloaded and built:
 #
 # SDL 1.2.14
-# boost 1.42.0 (headers only)
-# libogg 1.1.4
-# libpng 1.4.1
-# libvorbis 1.2.3
+# boost 1.43.0 (headers only)
+# libogg 1.2.0
+# libpng 1.4.2
+# libvorbis 1.3.1
 # lua 5.1.4
-# openal-soft 1.11.753
+# openal-soft 1.12.854
+# zlib 1.2.5
 #
 # This script requires a working mingw32 toolchain and other basic tools.
-# You also need zlib which may not have been included with your mingw32
-# installation; you're on your own for that one.  Have fun!
 #
 # Example usage:
 #   ./makedeps.sh -H i486-mingw32 -p /usr/i486-mingw32 -m "-j8"
@@ -89,12 +88,12 @@ rm -f "$DESTDIR/README"
 rm -rf "$DESTDIR/$PREFIX"
 
 
-PACKAGE="boost_1_42_0"
-VERSION="1.42.0"
+PACKAGE="boost_1_43_0"
+VERSION="1.43.0"
 cd $DESTDIR
 test ! -f $PACKAGE.tar.bz2 && (wget "http://sourceforge.net/projects/boost/files/boost/$VERSION/$PACKAGE.tar.bz2/download" || die "downloading $PACKAGE")
 (md5sum -c <<"EOL"
-7bf3b4eb841b62ffb0ade2b82218ebe6  boost_1_42_0.tar.bz2
+dd49767bfb726b0c774f7db0cef91ed1  boost_1_43_0.tar.bz2
 EOL
 ) || die "verifying $PACKAGE"
 rm -rf $PACKAGE
@@ -119,11 +118,11 @@ make $MAKEOPTS || die "making $PACKAGE"
 make DESTDIR=$DESTDIR install || die "installing $PACKAGE"
 
 
-PACKAGE="libogg-1.1.4"
+PACKAGE="libogg-1.2.0"
 cd $DESTDIR
 test ! -f $PACKAGE.tar.gz && (wget "http://downloads.xiph.org/releases/ogg/$PACKAGE.tar.gz" || die "downloading $PACKAGE")
 (md5sum -c <<"EOL"
-10200ec22543841d9d1c23e0aed4e5e9  libogg-1.1.4.tar.gz
+c95b73759acfc30712beef6ce4e88efa  libogg-1.2.0.tar.gz
 EOL
 ) || die "verifying $PACKAGE"
 rm -rf $PACKAGE
@@ -134,11 +133,11 @@ make $MAKEOPTS || die "making $PACKAGE"
 make DESTDIR=$DESTDIR install || die "installing $PACKAGE"
 
 
-PACKAGE="libvorbis-1.2.3"
+PACKAGE="libvorbis-1.3.1"
 cd $DESTDIR
 test ! -f $PACKAGE.tar.gz && (wget "http://downloads.xiph.org/releases/vorbis/$PACKAGE.tar.gz" || die "downloading $PACKAGE")
 (md5sum -c <<"EOL"
-5aa77f55c0e0aab8eb8ed982335daac8  libvorbis-1.2.3.tar.gz
+016e523fac70bdd786258a9d15fd36e9  libvorbis-1.3.1.tar.gz
 EOL
 ) || die "verifying $PACKAGE"
 rm -rf $PACKAGE
@@ -151,11 +150,11 @@ make $MAKEOPTS || die "making $PACKAGE"
 make DESTDIR=$DESTDIR install || die "installing $PACKAGE"
 
 
-PACKAGE="openal-soft-1.11.753-bin"
+PACKAGE="openal-soft-1.12.854-bin"
 cd $DESTDIR
 test ! -f $PACKAGE.zip && (wget "http://kcat.strangesoft.net/$PACKAGE.zip" || die "downloading $PACKAGE")
 (md5sum -c <<"EOL"
-20747ce5ca0f902ae082fef15d7b41a5  openal-soft-1.11.753-bin.zip
+a0d92a959895fa9d0981b39089897a01  openal-soft-1.12.854-bin.zip
 EOL
 ) || die "verifying $PACKAGE"
 rm -rf $PACKAGE
@@ -182,31 +181,31 @@ EOL
 ) || die "installing $PACKAGE"
 
 
-#PACKAGE="zlib123-dll"
-#cd $DESTDIR
-#test ! -f $PACKAGE.zip && (wget "http://www.zlib.net/$PACKAGE.zip" || die "downloading $PACKAGE")
-#(md5sum -c <<"EOL"
-#cc7fa97f9c19386bb701acc79d0abbca  zlib123-dll.zip
-#EOL
-#) || die "verifying $PACKAGE"
-#rm -rf $PACKAGE
-#unzip -d $PACKAGE $PACKAGE.zip || die "unpackaging $PACKAGE"
-#cd $PACKAGE
-#($HOST-dlltool -k -d lib/zlib.def -D zlib1.dll -l libzdll.a && \
-#$HOST-ranlib libzdll.a && \
-#mkdir -p $DESTDIR/$PREFIX/{lib,include} && \
-#install -p -m 0644 include/* $DESTDIR/$PREFIX/include/ && \
-#install -p -m 0755 zlib1.dll $DESTDIR/$PREFIX/bin/ && \
-#install -p -m 0755 libzdll.a $DESTDIR/$PREFIX/lib/ && \
-#cd $DESTDIR/$PREFIX/lib && \
-#ln -fs libzdll.a libz.dll.a) || die "installing $PACKAGE"
-
-
-PACKAGE="libpng-1.4.1"
+PACKAGE="zlib-1.2.5"
+cd $DESTDIR
+test ! -f $PACKAGE.zip && (wget "http://www.zlib.net/$PACKAGE.tar.gz" || die "downloading $PACKAGE")
+(md5sum -c <<"EOL"
+c735eab2d659a96e5a594c9e8541ad63  zlib-1.2.5.tar.gz
+EOL
+) || die "verifying $PACKAGE"
+rm -rf $PACKAGE
+tar xf $PACKAGE.tar.gz || die "unpackaging $PACKAGE"
+cd $PACKAGE
+cp win32/Makefile.gcc Makefile && \
+make $MAKEOPTS prefix="$PREFIX" PREFIX="$HOST-" || die "making $PACKAGE"
+(install -p -m 0644 zconf.h $DESTDIR/$PREFIX/include/ && \
+install -p -m 0644 zlib.h $DESTDIR/$PREFIX/include/ && \
+install -p -m 0755 zlib1.dll $DESTDIR/$PREFIX/bin/ && \
+install -p -m 0755 libzdll.a $DESTDIR/$PREFIX/lib/ && \
+cd $DESTDIR/$PREFIX/lib && \
+ln -fs libzdll.a libz.dll.a) || die "installing $PACKAGE"
+
+
+PACKAGE="libpng-1.4.2"
 cd $DESTDIR
 test ! -f $PACKAGE.tar.gz && (wget "http://prdownloads.sourceforge.net/libpng/$PACKAGE.tar.gz?download" || die "downloading $PACKAGE")
 (md5sum -c <<"EOL"
-fa0b2a84733463f90d3ac9f43ccafabc  libpng-1.4.1.tar.gz
+89fd334dc5fc84ff146b9269c4fa452f  libpng-1.4.2.tar.gz
 EOL
 ) || die "verifying $PACKAGE"
 rm -rf $PACKAGE
@@ -214,8 +213,8 @@ tar xzf $PACKAGE.tar.gz || die "unpackaging $PACKAGE"
 cd $PACKAGE
 cp scripts/makefile.mingw Makefile && \
 make $MAKEOPTS prefix="$PREFIX" CC="$HOST-gcc" AR="$HOST-ar" RANLIB="$HOST-ranlib" \
-ZLIBINC="-I$DESTDIR/$PREFIX/include" \
-ZLIBLIB="-L$DESTDIR/$PREFIX/lib" libpng.a libpng14.dll || die "making $PACKAGE"
+ZLIBINC="$DESTDIR/$PREFIX/include" \
+ZLIBLIB="$DESTDIR/$PREFIX/lib" libpng.a libpng14.dll || die "making $PACKAGE"
 make DESTDIR=$DESTDIR install prefix="$PREFIX" || die "installing $PACKAGE"
 
 
@@ -333,6 +332,10 @@ Cflags: -I\${includedir}
 EOL
 
 
+# wspiapi.h header file
+install -p -m 0644 $DESTDIR/../wspiapi.h $DESTDIR/$PREFIX/include/ || die "installing wspiapi.h"
+
+
 cd $DESTDIR/$PREFIX
 cat >README <<EOL