[Octave-cvsupdate] SF.net SVN: octave: [5071] trunk/octave-forge/admin/Windows/msvc/ run_compilation.sh

[<gof...@us...>]

Revision: 5071
          http://octave.svn.sourceforge.net/octave/?rev=5071&view=rev
Author:   goffioul
Date:     2008-05-19 21:45:35 -0700 (Mon, 19 May 2008)

Log Message:
-----------
Fix libcurl compilation

Modified Paths:
--------------
    trunk/octave-forge/admin/Windows/msvc/run_compilation.sh

Modified: trunk/octave-forge/admin/Windows/msvc/run_compilation.sh
===================================================================
--- trunk/octave-forge/admin/Windows/msvc/run_compilation.sh	2008-05-19 15:47:03 UTC (rev 5070)
+++ trunk/octave-forge/admin/Windows/msvc/run_compilation.sh	2008-05-20 04:45:35 UTC (rev 5071)
@@ -2311,13 +2311,20 @@
   (cd "$DOWNLOAD_DIR/curl-$curlver" &&
     for mf in lib/Makefile.vc8 src/Makefile.vc8; do
       sed -e "s/libcurl_imp/libcurl/g" -e "s/zdll\.lib/zlib.lib/g" $mf > ttt &&
-      mv ttt $mf
+      	mv ttt $mf
+      if test $crtver -ge 90; then
+        sed -e "s/bufferoverflowu\.lib//g" \
+            -e "s,/DBUILDING_LIBCURL,& /D_WIN32_WINNT=0x0501," \
+            $mf > ttt &&
+          mv ttt $mf
+      fi
     done
     nmake VC=vc8 vc-dll-zlib-dll &&
+    mt -outputresource:lib\\libcurl.dll -manifest lib\\release-dll-zlib-dll\\libcurl.dll.manifest &&
     cp lib/libcurl.dll "$tbindir" &&
     cp lib/libcurl.lib "$tlibdir" &&
-	cp COPYING "$tlicdir/COPYING.CURL" &&
-    mkdir "$tincludedir/curl" && cp include/curl/*.h "$tincludedir/curl") >&5 2>&1 && end_package
+    cp COPYING "$tlicdir/COPYING.CURL" &&
+    mkdir -p "$tincludedir/curl" && cp include/curl/*.h "$tincludedir/curl") >&5 2>&1 && end_package
   remove_package "$DOWNLOAD_DIR/curl-$curlver"
   if failed_package || test ! -f "$tbindir/libcurl.dll"; then
     echo "failed"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.