X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fyoink;a=blobdiff_plain;f=win32%2Fmakedeps.sh;h=e004aec4548944056de8f41ad00cc6cfb648e163;hp=026d9116b6522c76211f9be17554b4718680ef36;hb=58c1f9a499d3bb80ea2869b29c714f61e656d48d;hpb=751d631f20a2ba523c011b9059d6fc07d83077eb

diff --git a/win32/makedeps.sh b/win32/makedeps.sh
index 026d911..e004aec 100755
--- a/win32/makedeps.sh
+++ b/win32/makedeps.sh
@@ -23,10 +23,10 @@
 # libvorbis 1.2.3
 # lua 5.1.4
 # openal-soft 1.11.753
-# zlib 1.2.3
 #
 # This script requires a working mingw32 toolchain and other basic tools.
-# Have fun!
+# 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"
@@ -84,8 +84,9 @@ function die()
 }
 
 DESTDIR="`pwd`/deps"
-mkdir -p $DESTDIR
-rm -f $DESTDIR/README
+mkdir -p "$DESTDIR"
+rm -f "$DESTDIR/README"
+rm -rf "$DESTDIR/$PREFIX"
 
 
 PACKAGE="boost_1_42_0"
@@ -181,23 +182,24 @@ 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 && \
-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="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"
@@ -210,11 +212,11 @@ EOL
 rm -rf $PACKAGE
 tar xzf $PACKAGE.tar.gz || die "unpackaging $PACKAGE"
 cd $PACKAGE
-./configure --host=$HOST --prefix=$PREFIX \
-CPPFLAGS="-I$DESTDIR/$PREFIX/include" \
-LDFLAGS="-L$DESTDIR/$PREFIX/lib" || die "configuring $PACKAGE"
-make $MAKEOPTS || die "making $PACKAGE"
-make DESTDIR=$DESTDIR install || die "installing $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"
+make DESTDIR=$DESTDIR install prefix="$PREFIX" || die "installing $PACKAGE"
 
 
 PACKAGE="lua-5.1.4"