GOSTSec
/
sgminer
mirror of https://github.com/GOSTSec/sgminer
1
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Support building in cygwin. 

Revised the compiler platform macros. Building goes like
$ AMDAPPSDKROOT= CPPFLAGS=-I/usr/include/ncurses ./configure
nfactor-troky
Markus Peloquin 11 years ago
parent
4ce8a3ef3b
commit
bf8e37ce19
6 changed files with 41 additions and 43 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 30
      adl.c
  2. 14
      adl_functions.h
  3. 16
      api.c
  4. 6
      configure.ac
  5. 9
      miner.h
  6. 9
      util.c

30
adl.c
Unescape View File

@ -9,32 +9,32 @@
#include "config.h" #include "config.h"
#if defined(HAVE_ADL) && (defined(__linux) || defined (WIN32)) #if defined(HAVE_ADL) && (defined(__unix__) || defined (WIN32))
#include <stdio.h> #include <stdio.h>
#include <string.h> #include <string.h>
#include <math.h> #include <math.h>
#ifdef HAVE_CURSES #ifdef HAVE_CURSES
#include <curses.h> # include <curses.h>
#endif #endif
#include "miner.h" #include "miner.h"
#include "ADL_SDK/adl_sdk.h" #include "ADL_SDK/adl_sdk.h"
#include "compat.h" #include "compat.h"
#if defined (__linux) #if defined (__unix__)
#include <dlfcn.h> # include <dlfcn.h>
#include <stdlib.h> # include <stdlib.h>
#include <unistd.h> # include <unistd.h>
#else /* WIN32 */ #else /* WIN32 */
#include <windows.h> # include <windows.h>
#include <tchar.h> # include <tchar.h>
#endif #endif
#include "adl_functions.h" #include "adl_functions.h"
#ifndef HAVE_CURSES #ifndef HAVE_CURSES
#define wlogprint(...) applog(LOG_WARNING, __VA_ARGS__) # define wlogprint(...) applog(LOG_WARNING, __VA_ARGS__)
#endif #endif
bool adl_active; bool adl_active;
@ -69,7 +69,7 @@ static void __stdcall ADL_Main_Memory_Free (void **lpBuffer)
} }
} }
#if defined (LINUX) #if defined (UNIX)
// equivalent functions in linux // equivalent functions in linux
static void *GetProcAddress(void *pLibrary, const char *name) static void *GetProcAddress(void *pLibrary, const char *name)
{ {
@ -114,7 +114,7 @@ static ADL_OVERDRIVE6_FANSPEED_SET ADL_Overdrive6_FanSpeed_Set;
static ADL_OVERDRIVE6_STATE_SET ADL_Overdrive6_State_Set; static ADL_OVERDRIVE6_STATE_SET ADL_Overdrive6_State_Set;
static ADL_OVERDRIVE6_POWERCONTROL_SET ADL_Overdrive6_PowerControl_Set; static ADL_OVERDRIVE6_POWERCONTROL_SET ADL_Overdrive6_PowerControl_Set;
#if defined (LINUX) #if defined (UNIX)
static void *hDLL; // Handle to .so library static void *hDLL; // Handle to .so library
#else #else
HINSTANCE hDLL; // Handle to DLL HINSTANCE hDLL; // Handle to DLL
@ -266,7 +266,7 @@ static bool prepare_adl(void)
{ {
int result; int result;
#if defined (LINUX) #if defined (UNIX)
hDLL = dlopen( "libatiadlxx.so", RTLD_LAZY|RTLD_GLOBAL); hDLL = dlopen( "libatiadlxx.so", RTLD_LAZY|RTLD_GLOBAL);
#else #else
hDLL = LoadLibrary("atiadlxx.dll"); hDLL = LoadLibrary("atiadlxx.dll");
@ -397,7 +397,7 @@ void init_adl(int nDevs)
"strUDID:%s " "strUDID:%s "
"iBusNumber:%d " "iBusNumber:%d "
"iDeviceNumber:%d " "iDeviceNumber:%d "
#if defined(__linux) #if defined(__linux__)
"iDrvIndex:%d " "iDrvIndex:%d "
#endif #endif
"iFunctionNumber:%d " "iFunctionNumber:%d "
@ -409,7 +409,7 @@ void init_adl(int nDevs)
lpInfo[i].strUDID, lpInfo[i].strUDID,
lpInfo[i].iBusNumber, lpInfo[i].iBusNumber,
lpInfo[i].iDeviceNumber, lpInfo[i].iDeviceNumber,
#if defined(__linux) #if defined(__linux__)
lpInfo[i].iDrvIndex, lpInfo[i].iDrvIndex,
#endif #endif
lpInfo[i].iFunctionNumber, lpInfo[i].iFunctionNumber,
@ -1584,7 +1584,7 @@ static void free_adl(void)
{ {
ADL_Main_Memory_Free ((void **)&lpInfo); ADL_Main_Memory_Free ((void **)&lpInfo);
ADL_Main_Control_Destroy (); ADL_Main_Control_Destroy ();
#if defined (LINUX) #if defined (UNIX)
dlclose(hDLL); dlclose(hDLL);
#else #else
FreeLibrary(hDLL); FreeLibrary(hDLL);

14
adl_functions.h
Unescape View File

@ -29,13 +29,13 @@
// AMD ADL function types from Version 3.0 // AMD ADL function types from Version 3.0
// ------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------
#if defined (linux) #if defined (__unix__)
#include <dlfcn.h> //dyopen, dlsym, dlclose # include <dlfcn.h> //dyopen, dlsym, dlclose
#include <stdlib.h> # include <stdlib.h>
#include <string.h> //memeset # include <string.h> //memeset
#else #else
#include <windows.h> # include <windows.h>
#include <tchar.h> # include <tchar.h>
#endif #endif
#include "ADL_SDK/adl_sdk.h" #include "ADL_SDK/adl_sdk.h"
@ -267,7 +267,7 @@ typedef int ( *ADL_WORKSTATION_LOADBALANCING_CAPS ) (int iAdapterIndex, int *lpR
// ------------------------------------------------------------------------------------------------------------ // ------------------------------------------------------------------------------------------------------------
#ifdef LINUX #ifdef __linux__
// ADL Linux // ADL Linux
typedef int ( *ADL_ADAPTER_MEMORYINFO_GET ) (int iAdapterIndex, ADLMemoryInfo *lpMemoryInfo); typedef int ( *ADL_ADAPTER_MEMORYINFO_GET ) (int iAdapterIndex, ADLMemoryInfo *lpMemoryInfo);
typedef int ( *ADL_CONTROLLER_COLOR_SET ) (int iAdapterIndex, int iControllerIndex, ADLGamma adlGamma); typedef int ( *ADL_CONTROLLER_COLOR_SET ) (int iAdapterIndex, int iControllerIndex, ADLGamma adlGamma);

16
api.c
Unescape View File

@ -152,23 +152,19 @@ static const char *SCRYPTSTR = "scrypt";
static const char *DEVICECODE = "GPU "; static const char *DEVICECODE = "GPU ";
static const char *OSINFO = static const char *OSINFO =
#if defined(__linux) #if defined(__linux__)
"Linux"; "Linux";
#else #elif defined(__APPLE__)
#if defined(__APPLE__)
"Apple"; "Apple";
#else #elif defined(WIN32)
#if defined (WIN32)
"Windows"; "Windows";
#else #elif defined(__CYGWIN__)
#if defined(unix) "Cygwin";
#elif defined(__unix__)
"Unix"; "Unix";
#else #else
"Unknown"; "Unknown";
#endif #endif
#endif
#endif
#endif
#define _DEVS "DEVS" #define _DEVS "DEVS"
#define _POOLS "POOLS" #define _POOLS "POOLS"

6
configure.ac
Unescape View File

@ -297,10 +297,10 @@ AM_CONDITIONAL(USE_GIT_VERSION, [test x$usegitver = xyes])
#check execv signature #check execv signature
AC_COMPILE_IFELSE([AC_LANG_SOURCE([ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#include <process.h> #include <process.h>
int execv(const char*, const char*const*); int execv(const char*, char *const*);
])], ])],
AC_DEFINE([EXECV_2ND_ARG_TYPE], [const char* const*], [int execv(const char*, const char*const*);]), AC_DEFINE([EXECV_2ND_ARG_TYPE], [char* const*], [int execv(const char*, char*const*);]),
AC_DEFINE([EXECV_2ND_ARG_TYPE], [char* const*], [int execv(const char*, char*const*);])) AC_DEFINE([EXECV_2ND_ARG_TYPE], [const char* const*], [int execv(const char*, const char*const*);]))
dnl CCAN wants to know a lot of vars. dnl CCAN wants to know a lot of vars.
# All the configuration checks. Regrettably, the __attribute__ checks will # All the configuration checks. Regrettably, the __attribute__ checks will

9
miner.h
Unescape View File

@ -84,10 +84,11 @@ static inline int fsync (int fd)
#endif #endif
#endif /* __MINGW32__ */ #endif /* __MINGW32__ */
#if defined (__linux) #if defined (__unix__) && !defined(UNIX)
#ifndef LINUX # define UNIX
#define LINUX #endif
#endif #if defined (__linux__) && !defined(LINUX)
# define LINUX
#endif #endif
#ifdef WIN32 #ifdef WIN32

9
util.c
Unescape View File

@ -25,7 +25,7 @@
#include <sys/types.h> #include <sys/types.h>
#ifndef WIN32 #ifndef WIN32
#include <fcntl.h> #include <fcntl.h>
# ifdef __linux # ifdef __linux__
# include <sys/prctl.h> # include <sys/prctl.h>
# endif # endif
# include <sys/socket.h> # include <sys/socket.h>
@ -63,15 +63,16 @@ static void keep_sockalive(SOCKETTYPE fd)
#endif #endif
setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (const void *)&tcp_one, sizeof(tcp_one)); setsockopt(fd, SOL_SOCKET, SO_KEEPALIVE, (const void *)&tcp_one, sizeof(tcp_one));
#ifndef __linux__
if (!opt_delaynet) if (!opt_delaynet)
#ifndef __linux
setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (const void *)&tcp_one, sizeof(tcp_one)); setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, (const void *)&tcp_one, sizeof(tcp_one));
#else /* __linux */ #else /* __linux__ */
if (!opt_delaynet)
setsockopt(fd, SOL_TCP, TCP_NODELAY, (const void *)&tcp_one, sizeof(tcp_one)); setsockopt(fd, SOL_TCP, TCP_NODELAY, (const void *)&tcp_one, sizeof(tcp_one));
setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &tcp_one, sizeof(tcp_one)); setsockopt(fd, SOL_TCP, TCP_KEEPCNT, &tcp_one, sizeof(tcp_one));
setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &tcp_keepidle, sizeof(tcp_keepidle)); setsockopt(fd, SOL_TCP, TCP_KEEPIDLE, &tcp_keepidle, sizeof(tcp_keepidle));
setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &tcp_keepintvl, sizeof(tcp_keepintvl)); setsockopt(fd, SOL_TCP, TCP_KEEPINTVL, &tcp_keepintvl, sizeof(tcp_keepintvl));
#endif /* __linux */ #endif /* __linux__ */
#ifdef __APPLE_CC__ #ifdef __APPLE_CC__
setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &tcp_keepintvl, sizeof(tcp_keepintvl)); setsockopt(fd, IPPROTO_TCP, TCP_KEEPALIVE, &tcp_keepintvl, sizeof(tcp_keepintvl));

Write Preview
Loading…
Cancel
Save