Adding NFT to the emscripten version and improving compilation ( libjpeg )#4
Merged
Merged
Conversation
kalwalt
commented
Jan 10, 2020
| math(EXPR MEM 256*1024*1024) | ||
| message("CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}") | ||
| set(MEMORY "-s TOTAL_MEMORY=${MEM}") | ||
| set(MEMORY "-s TOTAL_MEMORY=${MEM} -s ALLOW_MEMORY_GROWTH=1") |
Collaborator
Author
There was a problem hiding this comment.
i need to check if this is still necessary
Collaborator
Author
|
@ThorstenBux I would like to merge this PR if you have nothing against it. I need to check some little deatils and after i will fine. I don't want to make big PR but i prefer add features step by step. |
|
@kalwalt awesome. Yes small PRs is very good. You may merge if you like :) |
Collaborator
Author
Yes, i need to check only if the |
|
It was needed before I used libJPEG from Emscripten. It should not be needed anymore. |
Collaborator
Author
|
Yes it's not needed! I'm merging this. 🙂 |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR add NFT support to the emscripten branch and simplify and correct the libjpeg includes and libs for building the project.
By emscripten v1.38.31 is only necessary to add the flags
-s USE_LIBJPEG=1and emscripten will add the includes and the libjpeg lib. see emscripten-core/emscripten#9170 and recent changes in jsartoolkit5 kalwalt/jsartoolkit5#13This is necessary if we want add NFT see my PR augmentmy-world/artoolkitX.js#18