aboutsummaryrefslogtreecommitdiffstats
path: root/solc
diff options
context:
space:
mode:
authorArkadiy Paronyan <arkady.paronyan@gmail.com>2015-09-15 00:51:56 +0800
committerArkadiy Paronyan <arkady.paronyan@gmail.com>2015-09-15 00:51:56 +0800
commit613ba2c3f1b3d26aa4adb5718215e1ececc190d3 (patch)
treeab02401a3e6c811d533f6f06c23ef54c7be307c1 /solc
parent9309b6aa82de6bbe7a93d34559b6cfca20c5978d (diff)
parent6b4e564b7c8f2a47cafa743e786d8873f2c04078 (diff)
downloaddexon-solidity-613ba2c3f1b3d26aa4adb5718215e1ececc190d3.tar.gz
dexon-solidity-613ba2c3f1b3d26aa4adb5718215e1ececc190d3.tar.zst
dexon-solidity-613ba2c3f1b3d26aa4adb5718215e1ececc190d3.zip
Merge pull request #73 from chriseth/emscripten
Changes required to compile on emscripten target.
Diffstat (limited to 'solc')
-rw-r--r--solc/CMakeLists.txt10
1 files changed, 8 insertions, 2 deletions
diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
index 2d23dab1..40ab0e21 100644
--- a/solc/CMakeLists.txt
+++ b/solc/CMakeLists.txt
@@ -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()