Browse Source

Merge branch 'httpsrv' into bfgminer

Luke Dashjr 12 years ago
parent
commit
b9646936b7
2 changed files with 4 additions and 1 deletions
  1. 1 0
      httpsrv.c
  2. 3 1
      make-release

+ 1 - 0
httpsrv.c

@@ -9,6 +9,7 @@
 
 
 #include "config.h"
 #include "config.h"
 
 
+#include <stdint.h>
 #include <sys/types.h>
 #include <sys/types.h>
 #include <sys/select.h>
 #include <sys/select.h>
 #include <sys/socket.h>
 #include <sys/socket.h>

+ 3 - 1
make-release

@@ -57,6 +57,7 @@ dlls='
 	libcurl-4.dll
 	libcurl-4.dll
 	pthreadGC2.dll
 	pthreadGC2.dll
 	libjansson-4.dll
 	libjansson-4.dll
+	libmicrohttpd-10.dll
 	libusb-1.0.dll
 	libusb-1.0.dll
 	zlib1.dll
 	zlib1.dll
 '
 '
@@ -81,11 +82,12 @@ for build in "${builds[@]}"; do
 	if test "x$DEBUG_RELEASE" = "x1"; then
 	if test "x$DEBUG_RELEASE" = "x1"; then
 		CFLAGS="${CFLAGS} -g"
 		CFLAGS="${CFLAGS} -g"
 	fi
 	fi
-	libdir="/usr/$machine/usr/bin/$dll"
 	for dll in $dlls; do
 	for dll in $dlls; do
 		libdir="/usr/$machine/usr/lib"
 		libdir="/usr/$machine/usr/lib"
 		[ -e "$libdir/$dll" ] ||
 		[ -e "$libdir/$dll" ] ||
 			libdir="/usr/$machine/usr/bin"
 			libdir="/usr/$machine/usr/bin"
+		[ -e "$libdir/$dll" ] ||
+			continue
 		cp -v -L "$libdir/$dll" "$PKGDIR"
 		cp -v -L "$libdir/$dll" "$PKGDIR"
 		"$machine"-strip "$PKGDIR/$dll"
 		"$machine"-strip "$PKGDIR/$dll"
 	done
 	done