Browse Source

Proper platform detection.

Use target instead of host.
Fix compilation for non win32 and non x86_64 platforms.
nfactor-troky
fleger 14 years ago committed by Jeff Garzik
parent
commit
a9a2840d81
  1. 2
      .gitignore
  2. 3
      Makefile.am
  3. 11
      configure.ac

2
.gitignore vendored

@ -19,6 +19,8 @@ cpuminer-config.h* @@ -19,6 +19,8 @@ cpuminer-config.h*
compile
config.log
config.status
config.guess
config.sub
mingw32-config.cache

3
Makefile.am

@ -20,8 +20,7 @@ minerd_SOURCES = elist.h miner.h compat.h \ @@ -20,8 +20,7 @@ minerd_SOURCES = elist.h miner.h compat.h \
minerd_LDFLAGS = $(PTHREAD_FLAGS)
minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@
if HAVE_WINDOWS
else
if HAVE_x86_64
if HAS_YASM
SUBDIRS += x86_64
minerd_LDADD += x86_64/libx8664.a

11
configure.ac

@ -1,6 +1,7 @@ @@ -1,6 +1,7 @@
AC_INIT([cpuminer], [0.8.1])
AC_PREREQ(2.52)
AC_CANONICAL_SYSTEM
AC_CONFIG_SRCDIR([cpu-miner.c])
AM_INIT_AUTOMAKE([gnu])
AC_CONFIG_HEADERS([cpuminer-config.h])
@ -20,12 +21,19 @@ AC_CHECK_HEADERS(syslog.h) @@ -20,12 +21,19 @@ AC_CHECK_HEADERS(syslog.h)
AC_FUNC_ALLOCA
case $host in
case $target in
*-*-mingw*)
have_x86_64=false
have_win32=true
PTHREAD_FLAGS=""
;;
x86_64-*)
have_x86_64=true
have_win32=false
PTHREAD_FLAGS="-pthread"
;;
*)
have_x86_64=false
have_win32=false
PTHREAD_FLAGS="-pthread"
;;
@ -37,6 +45,7 @@ AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS=-lpthread) @@ -37,6 +45,7 @@ AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS=-lpthread)
AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
AM_CONDITIONAL([HAVE_x86_64], [test x$have_x86_64 = xtrue])
if test x$request_jansson = xtrue
then

Loading…
Cancel
Save