LBRYCommunity/cpuminer
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity

Proper platform detection.

Browse source 
Use target instead of host.
Fix compilation for non win32 and non x86_64 platforms.
This commit is contained in:
fleger 2011-04-11 13:04:29 -04:00 committed by Jeff Garzik
parent 1a16f2ae63
commit a9a2840d81
3 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitignore vendored
View file

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

3
Makefile.am
View file

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

11
configure.ac
View file

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