Skip to content
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

Jump to bottom

Documentation updates for Raspberry Pi #2176

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Documentation updates for Raspberry Pi #2176

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions docs/htmlsrc/guides/linux-notes/rpi2.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,15 +71,15 @@ <h3 id="fetching-and-building-cinder">Fetching and Building Cinder</h3>
<pre><code>git clone --recursive https://github.com/cinder/Cinder.git
cd Cinder
mkdir build &amp;&amp; cd build
cmake .. -DCINDER_TARGET_GL=es2-rpi
cmake .. -DCINDER_TARGET_GL=es3-rpi
make -j 3
</code></pre>

<h1 id="building-and-running-basicapp">Building and Running BasicApp</h1>
<h3 id="building">Building</h3>
<pre><code>cd samples/BasicApp/proj/cmake
mkdir build &amp;&amp; cd build
cmake .. -DCINDER_TARGET_GL=es2-rpi
cmake .. -DCINDER_TARGET_GL=es3-rpi
make</code></pre>

<h3 id="running">Running</h3>
Expand Down
10 changes: 7 additions & 3 deletions docs/htmlsrc/guides/linux-notes/rpi3.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,19 @@ <h3 id="library-dependencies">Cinder Dependencies</h3>
gstreamer1.0-alsa \
gstreamer1.0-pulseaudio \
gstreamer1.0-plugins-bad \
libboost-filesystem-dev
libboost-filesystem-dev \
libxrandr-dev \
libxinerama-dev \
libx11-xcb-dev \
libxi-dev
</code></pre>

<h1 id="building-cinder">Building Cinder</h1>
<h3 id="fetching-and-building-cinder">Fetching and Building Cinder</h3>
<pre><code>git clone --recursive https://github.com/cinder/Cinder.git
cd Cinder
mkdir build &amp;&amp; cd build
cmake .. -DCINDER_TARGET_GL=es2-rpi
cmake .. -DCINDER_TARGET_GL=es3-rpi
make -j 3
</code></pre>

Expand All @@ -77,7 +81,7 @@ <h1 id="building-and-running-basicapp">Building and Running BasicApp</h1>
<h3 id="building">Building</h3>
<pre><code>cd samples/BasicApp/proj/cmake
mkdir build &amp;&amp; cd build
cmake .. -DCINDER_TARGET_GL=es2-rpi
cmake .. -DCINDER_TARGET_GL=es3-rpi
make</code></pre>

<h3 id="running">Running</h3>
Expand Down
2 changes: 1 addition & 1 deletion proj/cmake/configure.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ else()
set( CINDER_TARGET_GL_DEFAULT "" )
endif()

set( CINDER_TARGET_GL ${CINDER_TARGET_GL_DEFAULT} CACHE STRING "Target GL for the system. Valid options: ogl, es2, es3, es31, es32, es2-rpi" )
set( CINDER_TARGET_GL ${CINDER_TARGET_GL_DEFAULT} CACHE STRING "Target GL for the system. Valid options: ogl, es2, es3, es31, es32, es3-rpi" )

if( CINDER_TARGET_GL )
ci_log_v( "CINDER_TARGET_GL: ${CINDER_TARGET_GL}" )
Expand Down