Navigation Menu

Skip to content

Commit

Permalink
Build on Windows using mingw32.
Browse files Browse the repository at this point in the history
  • Loading branch information
Jeff Garzik authored and Jeff Garzik committed Nov 26, 2010
1 parent 4575851 commit 0a33311
Show file tree
Hide file tree
Showing 6 changed files with 36 additions and 4 deletions.
3 changes: 3 additions & 0 deletions .gitignore
@@ -1,5 +1,6 @@

minerd
minerd.exe
*.o

autom4te.cache
Expand All @@ -19,3 +20,5 @@ compile
config.log
config.status

mingw32-config.cache

4 changes: 2 additions & 2 deletions Makefile.am
Expand Up @@ -7,13 +7,13 @@ endif

SUBDIRS = compat

INCLUDES = -pthread -fno-strict-aliasing $(JANSSON_INCLUDES)
INCLUDES = $(PTHREAD_FLAGS) -fno-strict-aliasing $(JANSSON_INCLUDES)

bin_PROGRAMS = minerd

EXTRA_DIST = sha256_generic.c

minerd_SOURCES = util.c cpu-miner.c miner.h compat.h
minerd_LDFLAGS = -pthread
minerd_LDFLAGS = $(PTHREAD_FLAGS)
minerd_LDADD = @LIBCURL@ @JANSSON_LIBS@ @PTHREAD_LIBS@

10 changes: 10 additions & 0 deletions compat.h
Expand Up @@ -10,6 +10,16 @@ static inline void sleep(int secs)
Sleep(secs * 1000);
}

enum {
PRIO_PROCESS = 0,
};

static inline int setpriority(int which, int who, int prio)
{
/* FIXME - actually do something */
return 0;
}

#endif /* WIN32 */

#endif /* __COMPAT_H__ */
3 changes: 3 additions & 0 deletions compat/jansson/.gitignore
@@ -0,0 +1,3 @@

libjansson.a

13 changes: 13 additions & 0 deletions configure.ac
Expand Up @@ -17,6 +17,18 @@ AC_PROG_RANLIB
dnl Checks for header files.
AC_HEADER_STDC

case $host in
*-*-mingw*)
have_win32=true
PTHREAD_FLAGS=""
;;
*)
have_win32=false
PTHREAD_FLAGS="-pthread"
;;
esac


AC_CHECK_LIB(jansson, json_loads, request_jansson=false, request_jansson=true)
AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIBS=-lpthread)

Expand All @@ -35,6 +47,7 @@ LIBCURL_CHECK_CONFIG(, 7.10.1, ,
[AC_MSG_ERROR([Missing required libcurl >= 7.10.1])])

AC_SUBST(JANSSON_LIBS)
AC_SUBST(PTHREAD_FLAGS)
AC_SUBST(PTHREAD_LIBS)

AC_CONFIG_FILES([
Expand Down
7 changes: 5 additions & 2 deletions cpu-miner.c
Expand Up @@ -16,7 +16,9 @@
#include <stdbool.h>
#include <unistd.h>
#include <sys/time.h>
#ifndef WIN32
#include <sys/resource.h>
#endif
#include <pthread.h>
#include <getopt.h>
#include <jansson.h>
Expand Down Expand Up @@ -352,7 +354,7 @@ static void parse_cmdline(int argc, char *argv[])
static void calc_stats(void)
{
uint64_t hashes;
long double hd, sd;
double hd, sd;

pthread_mutex_lock(&stats_mutex);

Expand All @@ -366,7 +368,8 @@ static void calc_stats(void)
hd = hashes;
sd = STAT_SLEEP_INTERVAL;

fprintf(stderr, "wildly inaccurate HashMeter: %.2Lf khash/sec\n", hd / sd);
fprintf(stderr, "wildly inaccurate HashMeter: %.2f khash/sec\n",
hd / sd);
}

int main (int argc, char *argv[])
Expand Down

0 comments on commit 0a33311

Please sign in to comment.