cerc-io/solidity
16
0
Fork 0
mirror of https://github.com/ethereum/solidity synced 2023-10-03 13:03:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #73 from chriseth/emscripten

Browse Source 
Changes required to compile on emscripten target.
This commit is contained in:
Arkadiy Paronyan 2015-09-14 18:51:56 +02:00
commit 613ba2c3f1
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -29,6 +29,8 @@ print_config()
add_subdirectory(libsolidity)
add_subdirectory(solc)
add_subdirectory(test)
if (NOT EMSCRIPTEN)
add_subdirectory(test)
endif()
# TODO installation and packaging rules

10
solc/CMakeLists.txt
View File

@ -17,5 +17,11 @@ else()
eth_install_executable(${EXECUTABLE})
endif()
add_library(soljson jsonCompiler.cpp ${HEADERS})
target_link_libraries(soljson solidity)
if (EMSCRIPTEN)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_version\"]'")
add_executable(soljson jsonCompiler.cpp ${HEADERS})
eth_use(soljson REQUIRED Solidity)
else()
add_library(soljson jsonCompiler.cpp ${HEADERS})
target_link_libraries(soljson solidity)
endif()