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

Fix Windows build, that broke with yasm integration

Browse source
This commit is contained in:
Jeff Garzik 2011-03-14 23:36:28 -04:00 committed by Jeff Garzik
parent 35aba896a6
commit 0258fae450
5 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Makefile.am
View file

@ -20,8 +20,11 @@ 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
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
AM_CFLAGS = -DHAS_YASM AM_CFLAGS = -DHAS_YASM
endif endif
endif

1
configure.ac
View file

@ -33,6 +33,7 @@ AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)
AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS=-lpthread) 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])
if test x$request_jansson = xtrue if test x$request_jansson = xtrue
then then

1
cpu-miner.c
View file

@ -21,7 +21,6 @@
#ifndef WIN32 #ifndef WIN32
#include <sys/resource.h> #include <sys/resource.h>
#endif #endif
#include <pthread.h>
#include <getopt.h> #include <getopt.h>
#include <jansson.h> #include <jansson.h>
#include <curl/curl.h> #include <curl/curl.h>

1
miner.h
View file

@ -4,6 +4,7 @@
#include <stdbool.h> #include <stdbool.h>
#include <stdint.h> #include <stdint.h>
#include <sys/time.h> #include <sys/time.h>
#include <pthread.h>
#include <jansson.h> #include <jansson.h>
#include <curl/curl.h> #include <curl/curl.h>

1
util.c
View file

@ -14,7 +14,6 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <pthread.h>
#include <jansson.h> #include <jansson.h>
#include <curl/curl.h> #include <curl/curl.h>
#include "miner.h" #include "miner.h"