Browse Source

reverted libsecp256k1 changes

cl-refactor
arkpar 10 years ago
parent
commit
63ef6a74f9
  1. 10
      CMakeLists.txt
  2. 1
      evmjit/libevmjit/CMakeLists.txt

10
CMakeLists.txt

@ -369,8 +369,8 @@ if (EVMJIT)
set(EVMJIT_CPP TRUE) # include CPP-JIT connector set(EVMJIT_CPP TRUE) # include CPP-JIT connector
add_subdirectory(evmjit) add_subdirectory(evmjit)
if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC")
get_property(EVMJIT_DLLS_LOCAL TARGET "evmjit" PROPERTY LOCATION) get_property(EVMJIT_DLLS_LOCAL TARGET "evmjit" PROPERTY LOCATION)
set(EVMJIT_DLLS optimized ${EVMJIT_DLLS_LOCAL} debug ${EVMJIT_DLLS_LOCAL}) set(EVMJIT_DLLS optimized ${EVMJIT_DLLS_LOCAL} debug ${EVMJIT_DLLS_LOCAL})
endif() endif()
endif() endif()
@ -413,8 +413,10 @@ if (JSCONSOLE)
add_subdirectory(ethconsole) add_subdirectory(ethconsole)
endif () endif ()
add_definitions(-DETH_HAVE_SECP256K1) if (NOT WIN32)
add_subdirectory(secp256k1) add_definitions(-DETH_HAVE_SECP256K1)
add_subdirectory(secp256k1)
endif ()
add_subdirectory(libscrypt) add_subdirectory(libscrypt)
add_subdirectory(libdevcrypto) add_subdirectory(libdevcrypto)

1
evmjit/libevmjit/CMakeLists.txt

@ -29,6 +29,7 @@ else()
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti")
endif() endif()
set(EVMJIT_VERSION "0.0.0") set(EVMJIT_VERSION "0.0.0")
set(EVMJIT_VERSION_MAJOR 0) set(EVMJIT_VERSION_MAJOR 0)
set(EVMJIT_VERSION_MINOR 0) set(EVMJIT_VERSION_MINOR 0)

Loading…
Cancel
Save