Skip to content

Commit

Permalink
~ Added the RLOTTIE_WEB_ASSEMBLY for CMake. Removing the example fold…
Browse files Browse the repository at this point in the history
…er include in CMake from rlottie library.
  • Loading branch information
gindemit committed Jul 12, 2023
1 parent ad8ab19 commit 26116cb
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 3 deletions.
8 changes: 6 additions & 2 deletions .github/workflows/build_native_libraries.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,11 @@ jobs:
uses: actions/checkout@v2
with:
submodules: recursive


- name: Modify rlottie CMakeLists.txt
run: sed -i '/add_subdirectory(example)/d' dependency/rlottie/CMakeLists.txt


- name: Install Emscripten and Build
run: |
git clone https://github.com/emscripten-core/emsdk.git
Expand All @@ -168,7 +172,7 @@ jobs:
./emsdk activate latest
source ./emsdk_env.sh
cd ../projects/CMake
emcmake cmake -S . -B ./buildWebGL
emcmake cmake -S . -B ./buildWebGL -DRLOTTIE_WEB_ASSEMBLY=1
emmake cmake --build ./buildWebGL --config Release
tree ../../out
Expand Down
2 changes: 1 addition & 1 deletion projects/CMake/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ set (RLOTTIE_PLUGIN_LIBRARY_SOURCES

message("CMAKE_SYSTEM_PROCESSOR: ${CMAKE_SYSTEM_PROCESSOR}")

if (RLOTTIE_IOS)
if (RLOTTIE_IOS OR RLOTTIE_WEB_ASSEMBLY)
add_library (LottiePlugin STATIC ${RLOTTIE_PLUGIN_LIBRARY_SOURCES})
else()
add_library (LottiePlugin SHARED ${RLOTTIE_PLUGIN_LIBRARY_SOURCES})
Expand Down

0 comments on commit 26116cb

Please sign in to comment.