Skip to content

Commit e0201a2

Browse files
update docs
1 parent e8de1d3 commit e0201a2

14 files changed

+12157
-3965
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ There is now a separate dynamic version of this binding:
5151

5252
## Beta testing
5353

54-
You can install an alpha or beta version by specifying the version number like this:
54+
You can install an alpha or beta version by specifying the exact version number like this:
5555

5656
python3 -m pip install raylib==4.0a6
5757

docs/BUILDING.html

Lines changed: 18 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
3737
<p class="caption"><span class="caption-text">Contents:</span></p>
3838
<ul class="current">
39-
<li class="toctree-l1"><a class="reference internal" href="README.html">Python Bindings for Raylib 3.7</a></li>
39+
<li class="toctree-l1"><a class="reference internal" href="README.html">Python Bindings for Raylib 4.0-dev</a></li>
4040
<li class="toctree-l1"><a class="reference internal" href="README.html#quickstart">Quickstart</a></li>
4141
<li class="toctree-l1"><a class="reference internal" href="README.html#installation">Installation</a></li>
4242
<li class="toctree-l1"><a class="reference internal" href="README.html#how-to-use">How to use</a></li>
@@ -90,7 +90,7 @@
9090
<h1>Building from source<a class="headerlink" href="#building-from-source" title="Permalink to this headline"></a></h1>
9191
<div class="section" id="have-pip-build-from-source">
9292
<h2>Have Pip build from source<a class="headerlink" href="#have-pip-build-from-source" title="Permalink to this headline"></a></h2>
93-
<p>Useful if the binaries don’t work on your system.</p>
93+
<p>Useful if the binaries don’t work on your system, or you want to use a newer version of Raylib.</p>
9494
<p>Make sure Raylib is installed and then:</p>
9595
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">pip3</span> <span class="n">install</span> <span class="o">--</span><span class="n">no</span><span class="o">-</span><span class="n">binary</span> <span class="n">raylib</span> <span class="o">--</span><span class="n">upgrade</span> <span class="o">--</span><span class="n">force</span><span class="o">-</span><span class="n">reinstall</span> <span class="n">raylib</span>
9696
</pre></div>
@@ -130,20 +130,17 @@ <h3>Windows manual build<a class="headerlink" href="#windows-manual-build" title
130130
<span class="n">cd</span> <span class="o">..</span>\<span class="o">..</span>
131131
</pre></div>
132132
</div>
133-
<p>To update the dynamic libs, download the official release,
134-
e.g. <a class="reference external" href="https://github.com/raysan5/raylib/releases/download/3.7.0/raylib-3.7.0_win64_msvc16.zip">https://github.com/raysan5/raylib/releases/download/3.7.0/raylib-3.7.0_win64_msvc16.zip</a>
135-
and extract <code class="docutils literal notranslate"><span class="pre">raylib.dll</span></code> into <code class="docutils literal notranslate"><span class="pre">dynamic/raylib</span></code>.</p>
136133
<p>To build a binary wheel distribution:</p>
137134
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">rmdir</span> <span class="o">/</span><span class="n">Q</span> <span class="o">/</span><span class="n">S</span> <span class="n">build</span>
138135
<span class="n">pip3</span> <span class="n">install</span> <span class="n">cffi</span>
139136
<span class="n">pip3</span> <span class="n">install</span> <span class="n">wheel</span>
140137
<span class="n">python</span> <span class="n">setup</span><span class="o">.</span><span class="n">py</span> <span class="n">bdist_wheel</span>
141138
</pre></div>
142139
</div>
143-
<p>Alternatively, if you don’t want the static binaries and just want to
144-
use DLLs with raylib.dynamic:</p>
145-
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">python3</span> <span class="n">setup_dynamic</span><span class="o">.</span><span class="n">py</span> <span class="n">bdist_wheel</span>
146-
</pre></div>
140+
<div class="admonition-todo admonition" id="id1">
141+
<p class="admonition-title">Todo</p>
142+
<p>There’s a hardcoded path (to the raylib header files) in <cite>raylib/build.py</cite> you will probably need to edit.
143+
Would be useful if some Windows user could figure out how to auto detect this.</p>
147144
</div>
148145
<p>Then install it:</p>
149146
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">pip3</span> <span class="n">install</span> <span class="n">dist</span>\<span class="n">raylib</span><span class="o">-</span><span class="mf">3.7</span><span class="o">.</span><span class="mi">0</span><span class="o">-</span><span class="n">cp37</span><span class="o">-</span><span class="n">cp37m</span><span class="o">-</span><span class="n">win_amd64</span><span class="o">.</span><span class="n">whl</span>
@@ -154,13 +151,17 @@ <h3>Windows manual build<a class="headerlink" href="#windows-manual-build" title
154151
</div>
155152
<div class="section" id="linux-manual-build">
156153
<h3>Linux manual build<a class="headerlink" href="#linux-manual-build" title="Permalink to this headline"></a></h3>
157-
<p>These instructions have been tested on Ubuntu 20.10 and 16.04.</p>
158154
<p>Clone this repo including submodules so you get correct version of
159155
Raylib.</p>
160156
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">git</span> <span class="n">clone</span> <span class="o">--</span><span class="n">recurse</span><span class="o">-</span><span class="n">submodules</span> <span class="n">https</span><span class="p">:</span><span class="o">//</span><span class="n">github</span><span class="o">.</span><span class="n">com</span><span class="o">/</span><span class="n">electronstudio</span><span class="o">/</span><span class="n">raylib</span><span class="o">-</span><span class="n">python</span><span class="o">-</span><span class="n">cffi</span>
161157
</pre></div>
162158
</div>
163159
<p>Build and install Raylib from the raylib-c directory.</p>
160+
<div class="admonition note">
161+
<p class="admonition-title">Note</p>
162+
<p>You can instead use a different version of Raylib you installed from elsewhere, and it should still
163+
work!</p>
164+
</div>
164165
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">sudo</span> <span class="n">apt</span> <span class="n">install</span> <span class="n">cmake</span> <span class="n">libasound2</span><span class="o">-</span><span class="n">dev</span> <span class="n">mesa</span><span class="o">-</span><span class="n">common</span><span class="o">-</span><span class="n">dev</span> <span class="n">libx11</span><span class="o">-</span><span class="n">dev</span> <span class="n">libxrandr</span><span class="o">-</span><span class="n">dev</span> <span class="n">libxi</span><span class="o">-</span><span class="n">dev</span> <span class="n">xorg</span><span class="o">-</span><span class="n">dev</span> <span class="n">libgl1</span><span class="o">-</span><span class="n">mesa</span><span class="o">-</span><span class="n">dev</span> <span class="n">libglu1</span><span class="o">-</span><span class="n">mesa</span><span class="o">-</span><span class="n">dev</span>
165166
<span class="n">cd</span> <span class="n">raylib</span><span class="o">-</span><span class="n">python</span><span class="o">-</span><span class="n">cffi</span><span class="o">/</span><span class="n">raylib</span><span class="o">-</span><span class="n">c</span>
166167
<span class="n">mkdir</span> <span class="n">build</span>
@@ -183,18 +184,6 @@ <h3>Linux manual build<a class="headerlink" href="#linux-manual-build" title="Pe
183184
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="o">../..</span>
184185
</pre></div>
185186
</div>
186-
<div class="admonition note">
187-
<p class="admonition-title">Note</p>
188-
<p>Optional: Make a patched version of raylib header. (<strong>Not necessary</strong> if
189-
you’ve already got raylib_modifed.h from repo and haven’t changed
190-
anything.)</p>
191-
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="n">raylib</span>
192-
<span class="n">cp</span> <span class="n">raylib</span><span class="o">.</span><span class="n">h</span> <span class="n">raylib_modified</span><span class="o">.</span><span class="n">h</span>
193-
<span class="n">patch</span> <span class="o">-</span><span class="n">p0</span> <span class="o">&lt;</span><span class="n">raylib_modified</span><span class="o">.</span><span class="n">h</span><span class="o">.</span><span class="n">patch</span>
194-
<span class="n">cd</span> <span class="o">..</span>
195-
</pre></div>
196-
</div>
197-
</div>
198187
<p>Build</p>
199188
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">pip3</span> <span class="n">install</span> <span class="n">cffi</span>
200189
<span class="n">rm</span> <span class="o">-</span><span class="n">rf</span> <span class="n">build</span> <span class="n">raylib</span><span class="o">/</span><span class="n">_raylib_cffi</span><span class="o">.*</span>
@@ -203,7 +192,7 @@ <h3>Linux manual build<a class="headerlink" href="#linux-manual-build" title="Pe
203192
</div>
204193
<div class="admonition note">
205194
<p class="admonition-title">Note</p>
206-
<p>(Optional) To update the Linux dynamic libs (names will be different on other platfroms):</p>
195+
<p>(Optional) To update the Linux dynamic libs (names will be different on other platforms):</p>
207196
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">rm</span> <span class="n">dynamic</span><span class="o">/</span><span class="n">raylib</span><span class="o">/*.</span><span class="n">so</span><span class="o">*</span>
208197
<span class="n">cp</span> <span class="o">-</span><span class="n">P</span> <span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">lib</span><span class="o">/</span><span class="n">libraylib</span><span class="o">.</span><span class="n">so</span><span class="o">*</span> <span class="n">dynamic</span><span class="o">/</span><span class="n">raylib</span><span class="o">/</span>
209198
</pre></div>
@@ -228,7 +217,7 @@ <h3>Linux manual build<a class="headerlink" href="#linux-manual-build" title="Pe
228217
<code class="docutils literal notranslate"><span class="pre">--plat-name</span> <span class="pre">manylinux2014_x86_64</span></code> so on linux please run
229218
<code class="docutils literal notranslate"><span class="pre">./raylib/build_multi_linux.sh</span></code> )</p>
230219
</div>
231-
<div class="admonition-todo admonition" id="id1">
220+
<div class="admonition-todo admonition" id="id2">
232221
<p class="admonition-title">Todo</p>
233222
<p>Separate the instructions for preparing the dynamic module
234223
from the instructions for building the static module!</p>
@@ -243,9 +232,12 @@ <h3>Macos manual build<a class="headerlink" href="#macos-manual-build" title="Pe
243232
</pre></div>
244233
</div>
245234
<p>Build and install Raylib from the raylib-c directory.</p>
246-
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="n">raylib</span><span class="o">-</span><span class="n">python</span><span class="o">-</span><span class="n">cffi</span><span class="o">/</span><span class="n">raylib</span><span class="o">-</span><span class="n">c</span><span class="o">/</span><span class="n">src</span>
235+
<div class="highlight-default notranslate"><div class="highlight"><pre><span></span><span class="n">cd</span> <span class="n">raylib</span><span class="o">-</span><span class="n">python</span><span class="o">-</span><span class="n">cffi</span><span class="o">/</span><span class="n">raylib</span><span class="o">-</span><span class="n">c</span><span class="o">/</span>
236+
<span class="n">mkdir</span> <span class="n">build</span>
237+
<span class="n">cd</span> <span class="n">build</span>
238+
<span class="n">cmake</span> <span class="o">-</span><span class="n">DWITH_PIC</span><span class="o">=</span><span class="n">on</span> <span class="o">-</span><span class="n">DCMAKE_BUILD_TYPE</span><span class="o">=</span><span class="n">Release</span> <span class="o">..</span>
247239
<span class="n">make</span>
248-
<span class="n">sudo</span> <span class="n">cp</span> <span class="n">libraylib</span><span class="o">.</span><span class="n">a</span> <span class="o">/</span><span class="n">usr</span><span class="o">/</span><span class="n">local</span><span class="o">/</span><span class="n">lib</span><span class="o">/</span><span class="n">libraylib</span><span class="o">.</span><span class="n">a</span>
240+
<span class="n">sudo</span> <span class="n">make</span> <span class="n">install</span>
249241
<span class="n">cd</span> <span class="o">../..</span>
250242
</pre></div>
251243
</div>

docs/README.html

Lines changed: 23 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<head>
44
<meta charset="utf-8" />
55
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>Python Bindings for Raylib 3.7 &mdash; Raylib Python documentation</title><link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
6+
<title>Python Bindings for Raylib 4.0-dev &mdash; Raylib Python documentation</title><link rel="stylesheet" href="_static/css/theme.css" type="text/css" />
77
<link rel="stylesheet" href="_static/pygments.css" type="text/css" />
88
<link rel="stylesheet" href="_static/graphviz.css" type="text/css" />
99
<!--[if lt IE 9]>
@@ -37,10 +37,11 @@
3737
</div><div class="wy-menu wy-menu-vertical" data-spy="affix" role="navigation" aria-label="Navigation menu">
3838
<p class="caption"><span class="caption-text">Contents:</span></p>
3939
<ul class="current">
40-
<li class="toctree-l1 current"><a class="current reference internal" href="#">Python Bindings for Raylib 3.7</a></li>
40+
<li class="toctree-l1 current"><a class="current reference internal" href="#">Python Bindings for Raylib 4.0-dev</a></li>
4141
<li class="toctree-l1"><a class="reference internal" href="#quickstart">Quickstart</a></li>
4242
<li class="toctree-l1"><a class="reference internal" href="#installation">Installation</a><ul>
4343
<li class="toctree-l2"><a class="reference internal" href="#dynamic-binding-version">Dynamic binding version</a></li>
44+
<li class="toctree-l2"><a class="reference internal" href="#beta-testing">Beta testing</a></li>
4445
</ul>
4546
</li>
4647
<li class="toctree-l1"><a class="reference internal" href="#how-to-use">How to use</a><ul>
@@ -77,7 +78,7 @@
7778
<div role="navigation" aria-label="Page navigation">
7879
<ul class="wy-breadcrumbs">
7980
<li><a href="index.html" class="icon icon-home"></a> &raquo;</li>
80-
<li>Python Bindings for Raylib 3.7</li>
81+
<li>Python Bindings for Raylib 4.0-dev</li>
8182
<li class="wy-breadcrumbs-aside">
8283
<a href="_sources/README.md.txt" rel="nofollow"> View page source</a>
8384
</li>
@@ -87,11 +88,17 @@
8788
<div role="main" class="document" itemscope="itemscope" itemtype="http://schema.org/Article">
8889
<div itemprop="articleBody">
8990

90-
<div class="tex2jax_ignore mathjax_ignore section" id="python-bindings-for-raylib-3-7">
91-
<h1>Python Bindings for Raylib 3.7<a class="headerlink" href="#python-bindings-for-raylib-3-7" title="Permalink to this headline"></a></h1>
92-
<p>New CFFI API static bindings. Automatically generated to be as close as possible to
93-
original Raylib. Faster, fewer bugs and easier to maintain than ctypes. Commercial-friendly license.
94-
Docstrings and auto-completion.</p>
91+
<div class="tex2jax_ignore mathjax_ignore section" id="python-bindings-for-raylib-4-0-dev">
92+
<h1>Python Bindings for Raylib 4.0-dev<a class="headerlink" href="#python-bindings-for-raylib-4-0-dev" title="Permalink to this headline"></a></h1>
93+
<p>New CFFI API static bindings.</p>
94+
<ul class="simple">
95+
<li><p>Automatically generated to be as close as possible to
96+
original Raylib.</p></li>
97+
<li><p>Faster, fewer bugs and easier to maintain than ctypes.</p></li>
98+
<li><p>Commercial-friendly license.</p></li>
99+
<li><p>Docstrings and auto-completion.</p></li>
100+
<li><p><strong>Now includes extra libraries: raygui, rlgl and physac</strong></p></li>
101+
</ul>
95102
<p><a class="reference external" href="http://electronstudio.github.io/raylib-python-cffi">Full documentation</a></p>
96103
</div>
97104
<div class="tex2jax_ignore mathjax_ignore section" id="quickstart">
@@ -110,7 +117,7 @@ <h1>Quickstart<a class="headerlink" href="#quickstart" title="Permalink to this
110117
</div>
111118
<div class="tex2jax_ignore mathjax_ignore section" id="installation">
112119
<h1>Installation<a class="headerlink" href="#installation" title="Permalink to this headline"></a></h1>
113-
<p>First make sure you have latest pip installed:</p>
120+
<p>First make sure you have the latest pip installed:</p>
114121
<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>python3 -m pip install --upgrade pip
115122
</pre></div>
116123
</div>
@@ -130,6 +137,13 @@ <h2>Dynamic binding version<a class="headerlink" href="#dynamic-binding-version"
130137
</div>
131138
<p><a class="reference external" href="https://electronstudio.github.io/raylib-python-cffi/dynamic.html">Read this before using raylib_dynamic</a></p>
132139
</div>
140+
<div class="section" id="beta-testing">
141+
<h2>Beta testing<a class="headerlink" href="#beta-testing" title="Permalink to this headline"></a></h2>
142+
<p>You can install an alpha or beta version by specifying the version number like this:</p>
143+
<div class="highlight-none notranslate"><div class="highlight"><pre><span></span>python3 -m pip install raylib==4.0a6
144+
</pre></div>
145+
</div>
146+
</div>
133147
</div>
134148
<div class="tex2jax_ignore mathjax_ignore section" id="how-to-use">
135149
<h1>How to use<a class="headerlink" href="#how-to-use" title="Permalink to this headline"></a></h1>

docs/_sources/BUILDING.rst.txt

Lines changed: 17 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ Building from source
44
Have Pip build from source
55
--------------------------
66

7-
Useful if the binaries don’t work on your system.
7+
Useful if the binaries don’t work on your system, or you want to use a newer version of Raylib.
88

99
Make sure Raylib is installed and then:
1010

@@ -56,9 +56,7 @@ Build and install Raylib from the raylib-c directory.
5656
copy raylib\Release\raylib.lib ..\..
5757
cd ..\..
5858

59-
To update the dynamic libs, download the official release,
60-
e.g. https://github.com/raysan5/raylib/releases/download/3.7.0/raylib-3.7.0_win64_msvc16.zip
61-
and extract ``raylib.dll`` into ``dynamic/raylib``.
59+
6260

6361
To build a binary wheel distribution:
6462

@@ -69,12 +67,10 @@ To build a binary wheel distribution:
6967
pip3 install wheel
7068
python setup.py bdist_wheel
7169

72-
Alternatively, if you don’t want the static binaries and just want to
73-
use DLLs with raylib.dynamic:
74-
75-
::
70+
.. TODO::
71+
There's a hardcoded path (to the raylib header files) in `raylib/build.py` you will probably need to edit.
72+
Would be useful if some Windows user could figure out how to auto detect this.
7673

77-
python3 setup_dynamic.py bdist_wheel
7874

7975
Then install it:
8076

@@ -88,8 +84,6 @@ here.)
8884
Linux manual build
8985
~~~~~~~~~~~~~~~~~~~~~~
9086

91-
These instructions have been tested on Ubuntu 20.10 and 16.04.
92-
9387
Clone this repo including submodules so you get correct version of
9488
Raylib.
9589

@@ -99,6 +93,10 @@ Raylib.
9993

10094
Build and install Raylib from the raylib-c directory.
10195

96+
.. note::
97+
You can instead use a different version of Raylib you installed from elsewhere, and it should still
98+
work!
99+
102100
::
103101

104102
sudo apt install cmake libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
@@ -123,17 +121,6 @@ Build and install Raylib from the raylib-c directory.
123121
cd ../..
124122

125123

126-
.. note:: Optional: Make a patched version of raylib header. (**Not necessary** if
127-
you’ve already got raylib_modifed.h from repo and haven’t changed
128-
anything.)
129-
130-
::
131-
132-
cd raylib
133-
cp raylib.h raylib_modified.h
134-
patch -p0 <raylib_modified.h.patch
135-
cd ..
136-
137124
Build
138125

139126
::
@@ -142,7 +129,7 @@ Build
142129
rm -rf build raylib/_raylib_cffi.*
143130
python3 raylib/build.py
144131

145-
.. note:: (Optional) To update the Linux dynamic libs (names will be different on other platfroms):
132+
.. note:: (Optional) To update the Linux dynamic libs (names will be different on other platforms):
146133

147134
::
148135

@@ -196,10 +183,13 @@ Build and install Raylib from the raylib-c directory.
196183

197184
::
198185

199-
cd raylib-python-cffi/raylib-c/src
200-
make
201-
sudo cp libraylib.a /usr/local/lib/libraylib.a
202-
cd ../..
186+
cd raylib-python-cffi/raylib-c/
187+
mkdir build
188+
cd build
189+
cmake -DWITH_PIC=on -DCMAKE_BUILD_TYPE=Release ..
190+
make
191+
sudo make install
192+
cd ../..
203193

204194

205195
Build and install module.

0 commit comments

Comments
 (0)