Browse Source

Fix various build issues.

ckolivas 14 years ago
parent
commit
7d97ed6dd6
4 changed files with 10 additions and 1 deletions
  1. 6 0
      configure.ac
  2. 1 0
      device-cpu.c
  3. 1 1
      main.c
  4. 2 0
      miner.h

+ 6 - 0
configure.ac

@@ -112,6 +112,8 @@ if test "x$ATISTREAMSDKROOT" != x; then
 	OPENCL_LIBS="-L$ATISTREAMSDKROOT/lib/$ATI_STREAM_ARCH_DIR $OPENCL_LIBS"
 	OPENCL_LIBS="-L$ATISTREAMSDKROOT/lib/$ATI_STREAM_ARCH_DIR $OPENCL_LIBS"
 fi
 fi
 
 
+cpumining="no"
+
 AC_ARG_ENABLE([cpumining],
 AC_ARG_ENABLE([cpumining],
 	[AC_HELP_STRING([--enable-cpumining],[Build with cpu mining support(default disabled)])],
 	[AC_HELP_STRING([--enable-cpumining],[Build with cpu mining support(default disabled)])],
 	[cpumining=$enableval]
 	[cpumining=$enableval]
@@ -121,6 +123,8 @@ if test "x$cpumining" = xyes; then
 fi
 fi
 AM_CONDITIONAL([HAS_CPUMINE], [test x$cpumining = xyes])
 AM_CONDITIONAL([HAS_CPUMINE], [test x$cpumining = xyes])
 
 
+opencl="yes"
+
 AC_ARG_ENABLE([opencl],
 AC_ARG_ENABLE([opencl],
 	[AC_HELP_STRING([--disable-opencl],[Override detection and disable building with opencl])],
 	[AC_HELP_STRING([--disable-opencl],[Override detection and disable building with opencl])],
 	[opencl=$enableval]
 	[opencl=$enableval]
@@ -181,6 +185,8 @@ else
 	DLOPEN_FLAGS=""
 	DLOPEN_FLAGS=""
 fi
 fi
 
 
+bitforce="no"
+
 AC_ARG_ENABLE([bitforce],
 AC_ARG_ENABLE([bitforce],
 	[AC_HELP_STRING([--enable-bitforce],[Compile support for BitForce FPGAs(default disabled)])],
 	[AC_HELP_STRING([--enable-bitforce],[Compile support for BitForce FPGAs(default disabled)])],
 	[bitforce=$enableval]
 	[bitforce=$enableval]

+ 1 - 0
device-cpu.c

@@ -23,6 +23,7 @@
 
 
 #include <sys/stat.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <sys/types.h>
+#include <sys/wait.h>
 
 
 #ifndef WIN32
 #ifndef WIN32
 #include <sys/resource.h>
 #include <sys/resource.h>

+ 1 - 1
main.c

@@ -3896,7 +3896,7 @@ static void *api_thread(void *userdata)
 	return NULL;
 	return NULL;
 }
 }
 
 
-static void thread_reportin(struct thr_info *thr)
+void thread_reportin(struct thr_info *thr)
 {
 {
 	gettimeofday(&thr->last, NULL);
 	gettimeofday(&thr->last, NULL);
 	thr->cgpu->status = LIFE_WELL;
 	thr->cgpu->status = LIFE_WELL;

+ 2 - 0
miner.h

@@ -526,6 +526,8 @@ struct work_restart {
 	char			padding[128 - sizeof(unsigned long)];
 	char			padding[128 - sizeof(unsigned long)];
 };
 };
 
 
+extern void thread_reportin(struct thr_info *thr);
+
 extern void kill_work(void);
 extern void kill_work(void);
 
 
 extern void reinit_device(struct cgpu_info *cgpu);
 extern void reinit_device(struct cgpu_info *cgpu);