There have been merge conflicts #18
Open
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
…with rive-renderer Fix actions yaml with rive-renderer instead of cpp Diffs= 21ecf2775 Fix actions yaml with rive-renderer (#7930) c33d5d81b Update rive renderer readme (#7929) b03895fcf Update pls README (#7927) 3316d15ca Refactor pls into runtime (#7914) Co-authored-by: Chris Dalton <[email protected]> Co-authored-by: rivessamr <[email protected]> diff=\n\ndiff --cc pls/README.md index 1f4232bd,272c7360..00000000 --- a/pls/README.md +++ b/pls/README.md @@@ -2,21 -2,21 +2,37 @@@ The Rive Renderer is a vector and raster graphics renderer custom-built for Rive content, for animation, and for runtime. ++<<<<<<< ours +This repository contains the renderer code and an example for how to interface with it directly. The code within this repository does not contain a Rive runtime. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer. + +## Clone this repo + +Make sure to clone this repo with submodules! + +``` +git clone --recurse-submodules [email protected]:rive-app/rive-renderer.git ++======= + This folder contains the renderer code and an example for how to interface with it directly. It contains the best in class concrete implementation of Rive's rendering abstraction layer, which we call the Rive Renderer. + + ## Clone the rive-runtime repo + + ``` + git clone https://github.com/rive-app/rive-runtime.git + cd rive-runtime/pls ++>>>>>>> theirs ``` ## Build GLFW ``` ++<<<<<<< ours +cd submodules/rive-cpp/skia/dependencies +./make_glfw.sh ++======= + pushd ../skia/dependencies + ./make_glfw.sh + popd ++>>>>>>> theirs ``` ## Install Python PLY @@@ -28,7 -28,7 +44,11 @@@ python3 -m pip install pl ## Add build_rive.sh to $PATH ``` ++<<<<<<< ours +export PATH="$PATH:$(pwd)/submodules/rive-cpp/build" ++======= + export PATH="$PATH:$(realpath ../build)" ++>>>>>>> theirs ``` ## Build & run
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.
Please check commit message for details