aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2017-07-18 21:31:12 +0800
committerAlex Beregszaszi <alex@rtfs.hu>2017-07-18 22:31:49 +0800
commite9226225d7675e5d5cd03759a813ef79e3d3c590 (patch)
treee9064d2327809fd992a477ed69e8f2024f88efb3
parent37553dca9ae02b33d31c09323a84cc47f94b0176 (diff)
downloaddexon-solidity-e9226225d7675e5d5cd03759a813ef79e3d3c590.tar
dexon-solidity-e9226225d7675e5d5cd03759a813ef79e3d3c590.tar.gz
dexon-solidity-e9226225d7675e5d5cd03759a813ef79e3d3c590.tar.bz2
dexon-solidity-e9226225d7675e5d5cd03759a813ef79e3d3c590.tar.lz
dexon-solidity-e9226225d7675e5d5cd03759a813ef79e3d3c590.tar.xz
dexon-solidity-e9226225d7675e5d5cd03759a813ef79e3d3c590.tar.zst
dexon-solidity-e9226225d7675e5d5cd03759a813ef79e3d3c590.zip
Properly export the license() method in Emscripten
-rw-r--r--Changelog.md1
-rw-r--r--solc/CMakeLists.txt2
2 files changed, 2 insertions, 1 deletions
diff --git a/Changelog.md b/Changelog.md
index e64a8fea..f43897a2 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -1,6 +1,7 @@
### 0.4.14 (unreleased)
Features:
+ * C API (``jsonCompiler``): Export the ``license`` method.
* Inline Assembly: Show useful error message if trying to access calldata variables.
* Inline Assembly: Support variable declaration without initial value (defaults to 0).
* Type Checker: Disallow value transfers to contracts without a payable fallback function.
diff --git a/solc/CMakeLists.txt b/solc/CMakeLists.txt
index a5515d81..18e83e75 100644
--- a/solc/CMakeLists.txt
+++ b/solc/CMakeLists.txt
@@ -18,7 +18,7 @@ else()
endif()
if (EMSCRIPTEN)
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_version\",\"_compileJSONMulti\",\"_compileJSONCallback\",\"_compileStandard\"]' -s RESERVED_FUNCTION_POINTERS=20")
+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -s EXPORTED_FUNCTIONS='[\"_compileJSON\",\"_license\",\"_version\",\"_compileJSONMulti\",\"_compileJSONCallback\",\"_compileStandard\"]' -s RESERVED_FUNCTION_POINTERS=20")
add_executable(soljson jsonCompiler.cpp ${HEADERS})
eth_use(soljson REQUIRED Solidity::solidity)
else()