Experimental Emscripten build support #250
Closed
Conversation
This file contains 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
An object library allows other build targets to use the object files from this library. The change introduces osd_static_cpu_obj which is consumed by osd_static_cpu. This will be useful for emscripten integration where we cant use the compiled library, rather it will use the object files, targeting osd_static_cpu_obj.
Explicitly disable various dependency lookups when JAVASCRIPT mode is enabled. This is in preparation for emscripten builds.
When EMSCRIPTEN_DIR is set, also set the JAVASCRIPT flag, the C/C++ compilers to emcc and set various include paths to $EMSCRIPTEN_DIR/system/include.
Further leverage cmake object libraries to share object files for CPU and GPU OSD libraries, avoiding duplicate complation for dynamic/static build passes. CMake restricts object library inputs to header and source files, so the .inc files were renamed to .gen.h (which seems like a better name anyway) to make CMake happy. Also updated the .gitignore file to ignore .gen.h files.
Now, CC/CXX will only be set to emcc if the variable EMSCRIPTEN_CC_COMPILER and EMSCRIPTEN_CXX_COMPILER are not set.
Previously there were lots of separate if(NOT JAVASCRIPT) conditions, I've tried to consolidate them to make the script more readable.
|
It's hard to read from the github's web diff... but i can probably live with it: I'll catch up with you next week to get this merged in. |
|
closing as deprecated (much of the work probably would have to be redone to match the current state of the code base) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 change adds a new flag to the CMake build system which allows the user to specify the emscripten directory, which will turn on a new "JAVASCRIPT" flag. This flag disables several library dependencies and configures the build to find OpenGL in the emscripten system/include directory.
Also added some brief documentation in README.md