Fix Windows build, that broke with yasm integration
This commit is contained in:
parent
35aba896a6
commit
0258fae450
5 changed files with 5 additions and 2 deletions
|
@ -20,8 +20,11 @@ minerd_SOURCES = elist.h miner.h compat.h \
|
|||
minerd_LDFLAGS = $(PTHREAD_FLAGS)
|
||||
minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@
|
||||
|
||||
if HAVE_WINDOWS
|
||||
else
|
||||
if HAS_YASM
|
||||
SUBDIRS += x86_64
|
||||
minerd_LDADD += x86_64/libx8664.a
|
||||
AM_CFLAGS = -DHAS_YASM
|
||||
endif
|
||||
endif
|
||||
|
|
|
@ -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)
|
||||
|
||||
AM_CONDITIONAL([WANT_JANSSON], [test x$request_jansson = xtrue])
|
||||
AM_CONDITIONAL([HAVE_WINDOWS], [test x$have_win32 = xtrue])
|
||||
|
||||
if test x$request_jansson = xtrue
|
||||
then
|
||||
|
|
|
@ -21,7 +21,6 @@
|
|||
#ifndef WIN32
|
||||
#include <sys/resource.h>
|
||||
#endif
|
||||
#include <pthread.h>
|
||||
#include <getopt.h>
|
||||
#include <jansson.h>
|
||||
#include <curl/curl.h>
|
||||
|
|
1
miner.h
1
miner.h
|
@ -4,6 +4,7 @@
|
|||
#include <stdbool.h>
|
||||
#include <stdint.h>
|
||||
#include <sys/time.h>
|
||||
#include <pthread.h>
|
||||
#include <jansson.h>
|
||||
#include <curl/curl.h>
|
||||
|
||||
|
|
1
util.c
1
util.c
|
@ -14,7 +14,6 @@
|
|||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <pthread.h>
|
||||
#include <jansson.h>
|
||||
#include <curl/curl.h>
|
||||
#include "miner.h"
|
||||
|
|
Loading…
Reference in a new issue