fix singleton issues on windows

- pass all singletons into the backend libraries
- move some cpu config features from the cpu config file to the global config.txt
- add global jconf to the xported singleton list

1 files changed, 3 insertions, 2 deletions

diff --git a/backend/nvidia/minethd.h b/backend/nvidia/minethd.h
index a4b095e..9f3993e 100644
--- a/backend/nvidia/minethd.h
+++ b/backend/nvidia/minethd.h
@@ -7,6 +7,7 @@
 #include "../../jconf.h"
 #include "./jconf.h"
 #include "../IBackend.hpp"
+#include "../../Environment.hpp"
 #include <iostream>
 
 namespace xmrstak
@@ -33,13 +34,13 @@ private:
 	// Bottom 22 bits allow for an hour of work at 1000 H/s
 	inline uint32_t calc_start_nonce(uint32_t resume)
 	{
-		return reverseBits<uint32_t>(iThreadNo + GlobalStates::iThreadCount * resume);
+		return reverseBits<uint32_t>(iThreadNo + GlobalStates::inst().iThreadCount * resume);
 	}
 
 	// Limited version of the nonce calc above
 	inline uint32_t calc_nicehash_nonce(uint32_t start, uint32_t resume)
 	{
-		return start | ( ( reverseBits(iThreadNo + GlobalStates::iThreadCount * resume) >> 4u ) );
+		return start | ( ( reverseBits(iThreadNo + GlobalStates::inst().iThreadCount * resume) >> 4u ) );
 	}
 
 	void work_main();