Skip to content

feat: vm improvements #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fpelliccioni merged 1 commit into from
Feb 2, 2025
Merged

feat: vm improvements #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,12 @@ include(CheckCXXCompilerFlag)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/ci_utils/cmake)
include(KnuthTools)

if(CMAKE_SYSTEM_NAME STREQUAL "Emscripten")
# set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -matomics -mbulk-memory")
_add_cxx_compile_flag(-matomics _has_matomics_flag)
_add_cxx_compile_flag(-mbulk-memory _has_mbulk_memory_flag)
endif()

if (NOT MSVC)
_add_c_compile_flag(-Wall _has_all_warning_flag)
else()
Expand Down
17 changes: 7 additions & 10 deletions conan.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,26 +1,23 @@
{
"version": "0.5",
"requires": [
"zlib/1.3.1#b8bc2603263cf7eccbd6e17e66b0ed76%1736442063.163",
"spdlog/1.15.0#da21f74dd84627fa68601c4e3b9c3f00%1731353167.297",
"secp256k1/0.21.0#ed9709c61dfdb38ac8181f876503dca6%1732364020.326",
"network/0.49.0#8a59bc94de33b69ed1e4807449c65bb4%1736517367.9169223",
"lmdb/0.9.32#a9b704c2cb978c03eea680da55f26f8e%1715166447.685",
"libbacktrace/cci.20210118#a7691bfccd8caaf66309df196790a5a1%1725632951.012",
"infrastructure/0.39.0#55f5992bcbce2037eb333af5ba88dd6e%1736516707.734",
"infrastructure/0.39.0#537f7a3486784c49ad88c6e8f5865f4b%1736535276.886087",
"gmp/6.3.0#df20ffb6d21c34d67704305bcd1dea9e%1716966936.742",
"fmt/11.0.2#b4a24d70b93466b9b508ddb7b014643b%1735899162.196",
"expected-lite/0.8.0#f87b3ec27a4f46894950b70f8d08af24%1717770563.402",
"domain/0.41.0#dfad6eee19a5d3f465307058947621e1%1736517295.638",
"database/0.47.0#84301c5102e9ba926aad433a4fdd7c60%1736517634.604",
"ctre/3.9.0#318a83b26476a59466795daac928f3ec%1716966898.508",
"bzip2/1.0.8#d00dac990f08d991998d624be81a9526%1725632951.439",
"domain/0.41.0#6ba2f08db6589ec78f97f9fd3ee7d96d%1736535314.602975",
"database/0.47.0#98dcf91d0458951fe46f2326da366ee9%1736535456.728255",
"ctre/3.9.0#318a83b26476a59466795daac928f3ec%1715925273.754",
"boost/1.86.0#ce76e7477e466d7d8cbcf738c5d64175%1736442226.917",
"blockchain/0.45.0#e01200a14a6b62dc01ed65bb0b1094d4%1736517907.8301456"
"blockchain/0.45.0#62caba7d34dcd9981ec20aba2e8385fc%1736535586.030174"
],
"build_requires": [
"nodejs/18.15.0#2e468fc390ccdb9595ea1a5bbb74d59f%1699800364.91",
"m4/1.4.19#b38ced39a01e31fef5435bc634461fd2%1700758725.451",
"b2/5.2.1#91bc73931a0acb655947a81569ed8b80%1718416612.241"
"emsdk/3.1.66#dbe775f114c0ec093539734107e2ab5e%1733138978.7973351"
],
"python_requires": [],
"config_requires": []
Expand Down