diff options
| author | fleger <florian6.leger@laposte.net> | 2011-04-11 13:04:29 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2011-04-11 13:04:29 -0400 |
| commit | a9a2840d8198e45a990519431aa26586bbac8932 (patch) | |
| tree | 6b43dca7b3652c724c3c29f87db6ba367cbdb678 | |
| parent | 1a16f2ae63fa1fad8d3069db100149eb6d236d82 (diff) | |
Proper platform detection.
Use target instead of host.
Fix compilation for non win32 and non x86_64 platforms.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 11 |
3 files changed, 13 insertions, 3 deletions
@@ -19,6 +19,8 @@ cpuminer-config.h* compile config.log config.status +config.guess +config.sub mingw32-config.cache diff --git a/Makefile.am b/Makefile.am index 04a45da..4d4f2bb 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 diff --git a/configure.ac b/configure.ac index 692c8b0..3176a1c 100644 --- a/configure.ac +++ b/configure.ac @@ -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) 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) 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 |