Browse Source

alethzero working on windows!

cl-refactor
debris 10 years ago
parent
commit
c014442517
  1. 5
      alethzero/CMakeLists.txt
  2. 15
      alethzero/MainWin.cpp
  3. 1
      cmake/EthCompilerSettings.cmake
  4. 2
      libdevcrypto/CMakeLists.txt
  5. 3
      mix/CMakeLists.txt

5
alethzero/CMakeLists.txt

@ -34,11 +34,10 @@ else ()
add_executable(${EXECUTABLE} Main.ui ${SRC_LIST} ${HEADERS})
endif ()
add_dependencies(${EXECUTABLE} BuildInfo.h)
qt5_use_modules(${EXECUTABLE} Core)
target_link_libraries(${EXECUTABLE} ${JSONCPP_LIBRARIES})
#target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
#target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_COMMON_LIBRARY})
#target_link_libraries(${EXECUTABLE} ${JSON_RPC_CPP_SERVER_LIBRARY})
target_link_libraries(${EXECUTABLE} webthree)
target_link_libraries(${EXECUTABLE} qethereum)
target_link_libraries(${EXECUTABLE} ethereum)

15
alethzero/MainWin.cpp

@ -2240,18 +2240,3 @@ void Main::refreshWhispers()
ui->whispers->addItem(item);
}
}
// extra bits needed to link on VS
#ifdef _MSC_VER
// include moc file, ofuscated to hide from automoc
#include\
"moc_MainWin.cpp"
#include\
"moc_MiningView.cpp"
#include\
"moc_DownloadView.cpp"
#endif

1
cmake/EthCompilerSettings.cmake

@ -19,6 +19,7 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
# specify Exception Handling Model in msvc
set(CMAKE_C_FLAGS "/EHsc")
set(CMAKE_CXX_FLAGS "/EHsc")
# windows likes static
set(ETH_STATIC 1)

2
libdevcrypto/CMakeLists.txt

@ -18,7 +18,7 @@ endif()
target_link_libraries(${EXECUTABLE} ${Boost_FILESYSTEM_LIBRARY_RELEASE})
target_link_libraries(${EXECUTABLE} ${LEVELDB_LIBRARY})
target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LIBRARIES})
target_link_libraries(${EXECUTABLE} ${CRYPTOPP_LIBRARY})
target_link_libraries(${EXECUTABLE} devcore)
target_link_libraries(${EXECUTABLE} secp256k1)

3
mix/CMakeLists.txt

@ -34,10 +34,9 @@ else ()
add_executable(${EXECUTEABLE} ${SRC_LIST} ${HEADERS} ${UI_RESOURCES})
endif ()
#qt5_use_modules(${EXECUTEABLE} Core Gui Widgets Network WebKit WebKitWidgets)
target_link_libraries(${EXECUTEABLE} Qt5::Core)
target_link_libraries(${EXECUTEABLE} Qt5::Gui)
target_link_libraries(${EXECUTEABLE} webthree qethereum ethereum evm ethcore devcrypto secp256k1 ${CRYPTOPP_LS} serpent lll solidity evmcore devcore web3jsonrpc jsqrc)
target_link_libraries(${EXECUTEABLE} webthree qethereum ethereum evm ethcore devcrypto secp256k1 serpent lll solidity evmcore devcore web3jsonrpc jsqrc)
if (APPLE)
# First have qt5 install plugins and frameworks

Loading…
Cancel
Save