From 916eb21aa3f6f3b13df0d9306ee0e9c395af1d43 Mon Sep 17 00:00:00 2001 From: R4SAS Date: Wed, 14 Jun 2017 21:53:07 +0300 Subject: [PATCH] fix mingw ncurses, fix git warning --- Makefile.am | 2 +- adl.c | 6 +++++- driver-opencl.c | 4 ++++ sgminer.c | 4 ++++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/Makefile.am b/Makefile.am index 31e09b25..80207b7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,7 +27,7 @@ endif sgminer_CPPFLAGS += $(ADL_CPPFLAGS) if USE_GIT_VERSION -GIT_VERSION := $(shell sh -c 'git describe --abbrev=4 --dirty') +GIT_VERSION := $(shell sh -c 'git describe --tags --abbrev=4 --dirty') sgminer_CPPFLAGS += -DGIT_VERSION=\"$(GIT_VERSION)\" endif diff --git a/adl.c b/adl.c index dbc66c83..dba8e36d 100644 --- a/adl.c +++ b/adl.c @@ -16,7 +16,11 @@ #include #ifdef HAVE_CURSES -# include +#if defined(__MINGW32__) +#include +#else +#include +#endif // defined(__MINGW32__) #endif #include "miner.h" diff --git a/driver-opencl.c b/driver-opencl.c index 3e6667bc..1abb4bf1 100644 --- a/driver-opencl.c +++ b/driver-opencl.c @@ -12,7 +12,11 @@ #include "config.h" #ifdef HAVE_CURSES +#if defined(__MINGW32__) +#include +#else #include +#endif // defined(__MINGW32__) #endif #include diff --git a/sgminer.c b/sgminer.c index 8a79d8bf..4ce82059 100644 --- a/sgminer.c +++ b/sgminer.c @@ -13,7 +13,11 @@ #include "config.h" #ifdef HAVE_CURSES +#if defined(__MINGW32__) +#include +#else #include +#endif // defined(__MINGW32__) #endif #include