win64 compilation fixes & code clean-up

CMakeLists.txt

@@ -37,7 +37,6 @@ if(TESTNET)
 endif()
 
 set(BUILD_GUI FALSE CACHE BOOL "Build qt-daemon")
-set(USE_OPENCL FALSE CACHE BOOL "Build with opencl miner")
 
 
 set(STATIC ${MSVC} CACHE BOOL "Link libraries statically")
@@ -171,18 +170,6 @@ if(BUILD_GUI)
   find_package(Qt5Widgets REQUIRED)  
 endif()
 
-if(USE_OPENCL)
-  find_package( OpenCL )
-  if(NOT OpenCL_FOUND)
-	# add some Opencl
-  endif()
-
-  include_directories( ${OpenCL_INCLUDE_DIRS} ) 
-  include_directories( ${OpenCL_INCLUDE_DIR} ) 
-  add_definitions(-DUSE_OPENCL)
-endif()
-
-
 set(COMMIT_ID_IN_VERSION ON CACHE BOOL "Include commit ID in version")
 file(MAKE_DIRECTORY "${CMAKE_BINARY_DIR}/version")
 if (NOT COMMIT_ID_IN_VERSION)

src/currency_core/currency_core.h

@@ -15,11 +15,7 @@
 #include "storages/portable_storage_template_helper.h"
 #include "tx_pool.h"
 #include "blockchain_storage.h"
-#ifdef USE_OPENCL
-#include "gpu_miner.h"
-#else
 #include "miner.h"
-#endif
 #include "connection_context.h"
 #include "currency_core/currency_stat_info.h"
 #include "warnings.h"
@@ -57,11 +53,7 @@ namespace currency
      virtual bool handle_block_found(const block& b, block_verification_context* p_verification_result = nullptr);
      virtual bool get_block_template(block& b, const account_public_address& adr, const account_public_address& stakeholder_address, wide_difficulty_type& diffic, uint64_t& height, const blobdata& ex_nonce, bool pos = false, const pos_entry& pe = pos_entry());
 
-#ifdef USE_OPENCL
-     gpu_miner& get_miner(){return m_miner;}
-#else
      miner& get_miner(){ return m_miner; }
-#endif
      static void init_options(boost::program_options::options_description& desc);
      bool init(const boost::program_options::variables_map& vm);
      bool set_genesis_block(const block& b);
@@ -145,11 +137,7 @@ namespace currency
      tx_memory_pool m_mempool;
      i_currency_protocol* m_pprotocol;
      critical_section m_incoming_tx_lock;
-#ifdef USE_OPENCL
-     gpu_miner m_miner;
-#else
      miner m_miner;
-#endif
      account_public_address m_miner_address;
      std::string m_config_folder;
      currency_protocol_stub m_protocol_stub;

src/daemon/daemon.cpp

@@ -83,11 +83,7 @@ int main(int argc, char* argv[])
   currency::core::init_options(desc_cmd_sett);
   currency::core_rpc_server::init_options(desc_cmd_sett);
   nodetool::node_server<currency::t_currency_protocol_handler<currency::core> >::init_options(desc_cmd_sett);
-#ifdef USE_OPENCL
-  currency::gpu_miner::init_options(desc_cmd_sett);
-#else
   currency::miner::init_options(desc_cmd_sett);
-#endif
   bc_services::bc_offers_service::init_options(desc_cmd_sett);
 
 
@@ -105,10 +101,6 @@ int main(int argc, char* argv[])
       std::cout << desc_options << std::endl;
       return false;
     }
-#ifdef USE_OPENCL
-    if (currency::gpu_miner::handle_cli_info_commands(vm))
-      return false;
-#endif
 
     std::string data_dir = command_line::get_arg(vm, command_line::arg_data_dir);
     std::string config = command_line::get_arg(vm, command_line::arg_config_file);

src/pch/stdafx.h

@@ -102,6 +102,5 @@ POP_WARNINGS
 //
 // contrib
 //
-#include "ethereum/libethash/internal.h"
 #include "eos_portable_archive/eos/portable_archive.hpp"
 #include "db/liblmdb/lmdb.h"