diff options
| author | debris <marek.kotewicz@gmail.com> | 2014-12-06 00:00:26 +0800 |
|---|---|---|
| committer | debris <marek.kotewicz@gmail.com> | 2014-12-06 00:00:26 +0800 |
| commit | 53e0ff10f5bbe9c469633c2f3e2a22bd1373379e (patch) | |
| tree | 3b3f1736dc0178a269a665d8fdf6ddea9694db00 | |
| parent | fa43a0ee959d83959467bb5d08660756c33da682 (diff) | |
| download | dexon-solidity-53e0ff10f5bbe9c469633c2f3e2a22bd1373379e.tar dexon-solidity-53e0ff10f5bbe9c469633c2f3e2a22bd1373379e.tar.gz dexon-solidity-53e0ff10f5bbe9c469633c2f3e2a22bd1373379e.tar.bz2 dexon-solidity-53e0ff10f5bbe9c469633c2f3e2a22bd1373379e.tar.lz dexon-solidity-53e0ff10f5bbe9c469633c2f3e2a22bd1373379e.tar.xz dexon-solidity-53e0ff10f5bbe9c469633c2f3e2a22bd1373379e.tar.zst dexon-solidity-53e0ff10f5bbe9c469633c2f3e2a22bd1373379e.zip | |
solidity compiling on windows, fixed Compiler Error C2797
| -rw-r--r-- | CMakeLists.txt | 5 | ||||
| -rw-r--r-- | GlobalContext.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 260493b0..8522130e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,6 +5,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DSTATICLIB") aux_source_directory(. SRC_LIST) +include_directories(${Boost_INCLUDE_DIRS}) +include_directories(..) + set(EXECUTABLE solidity) file(GLOB HEADERS "*.h") @@ -14,8 +17,6 @@ else() add_library(${EXECUTABLE} SHARED ${SRC_LIST} ${HEADERS}) endif() -include_directories(..) - target_link_libraries(${EXECUTABLE} evmcore devcore) install( TARGETS ${EXECUTABLE} ARCHIVE DESTINATION lib LIBRARY DESTINATION lib ) diff --git a/GlobalContext.cpp b/GlobalContext.cpp index d8b63707..b54b93c0 100644 --- a/GlobalContext.cpp +++ b/GlobalContext.cpp @@ -33,7 +33,7 @@ namespace solidity { GlobalContext::GlobalContext(): - m_magicVariables{make_shared<MagicVariableDeclaration>("block", make_shared<MagicType>(MagicType::Kind::BLOCK)), +m_magicVariables(vector<shared_ptr<MagicVariableDeclaration>>{make_shared<MagicVariableDeclaration>("block", make_shared<MagicType>(MagicType::Kind::BLOCK)), make_shared<MagicVariableDeclaration>("msg", make_shared<MagicType>(MagicType::Kind::MSG)), make_shared<MagicVariableDeclaration>("tx", make_shared<MagicType>(MagicType::Kind::TX)), make_shared<MagicVariableDeclaration>("suicide", @@ -59,7 +59,7 @@ GlobalContext::GlobalContext(): make_shared<MagicVariableDeclaration>("ripemd160", make_shared<FunctionType>(TypePointers({std::make_shared<IntegerType>(256, IntegerType::Modifier::HASH)}), TypePointers({std::make_shared<IntegerType>(160, IntegerType::Modifier::HASH)}), - FunctionType::Location::RIPEMD160))} + FunctionType::Location::RIPEMD160))}) { } |