From 3ac76b8aaa2b1af0ef512163e9144d0b44f4e9f1 Mon Sep 17 00:00:00 2001 From: richard Date: Thu, 11 Aug 2022 22:10:15 +0100 Subject: [PATCH] fix warning on linux builds and update docs --- .github/workflows/build.yml | 2 +- docs/.buildinfo | 2 +- docs/BUILDING.html | 81 +- docs/README.html | 108 +- docs/RPI.html | 144 + docs/_sources/BUILDING.rst.txt | 42 +- docs/_sources/README.md.txt | 24 +- docs/_sources/RPI.rst.txt | 34 + docs/_sources/dynamic.rst.txt | 5 +- docs/_sources/index.rst.txt | 1 + docs/_sources/pyray.rst.txt | 28 +- docs/_sources/raylib.rst.txt | 12 +- docs/_static/basic.css | 114 +- docs/_static/doctools.js | 82 +- docs/_static/documentation_options.js | 4 +- docs/_static/graphviz.css | 2 +- docs/_static/jquery-3.5.1.js | 10872 ++++++++++++++++++++++++ docs/_static/jquery.js | 10872 +----------------------- docs/_static/language_data.js | 6 +- docs/_static/pygments.css | 10 +- docs/_static/searchtools.js | 51 +- docs/_static/underscore-1.13.1.js | 2042 +++++ docs/_static/underscore.js | 1711 +--- docs/dynamic.html | 26 +- docs/genindex.html | 2915 +++++-- docs/index.html | 29 +- docs/objects.inv | Bin 15792 -> 18290 bytes docs/py-modindex.html | 13 +- docs/pyray.html | 10554 ++++++++++++----------- docs/raylib.html | 9056 +++++++++++++------- docs/search.html | 13 +- docs/searchindex.js | 2 +- 32 files changed, 27346 insertions(+), 21511 deletions(-) create mode 100644 docs/RPI.html create mode 100644 docs/_sources/RPI.rst.txt create mode 100644 docs/_static/jquery-3.5.1.js create mode 100644 docs/_static/underscore-1.13.1.js diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 8e3113e..72f4637 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -189,7 +189,7 @@ jobs: cd raylib-c mkdir build cd build - cmake -DBUILD_EXAMPLES=off -DINCLUDE_EVERYTHING=on -DSUPPORT_FILEFORMAT_JPG=on -DWITH_PIC=on -DCMAKE_BUILD_TYPE=Release .. + cmake -DBUILD_EXAMPLES=off -DINCLUDE_EVERYTHING=on -DSUPPORT_FILEFORMAT_JPG=on -DWITH_PIC=on -DCMAKE_BUILD_TYPE=Release -DOpenGL_GL_PREFERENCE=GLVND .. make -j2 sudo make install - name: Copy extras diff --git a/docs/.buildinfo b/docs/.buildinfo index 536dc0f..ef463aa 100644 --- a/docs/.buildinfo +++ b/docs/.buildinfo @@ -1,4 +1,4 @@ # Sphinx build info version 1 # This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 76ca504c87a97062e6f8d0973741212b +config: 999398ae0ca6fd9fb3a4ff0f644e1a93 tags: 645f666f9bcd5a90fca523b33c5a78b7 diff --git a/docs/BUILDING.html b/docs/BUILDING.html index 29fb923..f8c3290 100644 --- a/docs/BUILDING.html +++ b/docs/BUILDING.html @@ -1,21 +1,25 @@ - + + - Building from source — Raylib Python documentation - + Building from source — Raylib Python documentation + + - + + + @@ -34,9 +38,9 @@ @@ -87,14 +91,15 @@
-
+

Building from source

-
+

Have Pip build from source

This is useful if the binaries don’t work on your system, or you want to use a newer version of Raylib.

First make sure Raylib is installed. On Linux/Mac it must include the pkg-config files. Best way to ensure this is to compile and install Raylib using CMake: https://github.com/raysan5/raylib/wiki/Working-on-GNU-Linux#build-raylib-using-cmake

-
cd raylib-4.0.0
+
Requirements for build: cmake, pkg-config.

+
cd raylib-4.2.0
 mkdir build
 cd build
 cmake  -DWITH_PIC=on -DCMAKE_BUILD_TYPE=Release ..
@@ -106,8 +111,8 @@ is to compile and install Raylib using CMake: 
pip3 install --no-binary raylib --upgrade --force-reinstall raylib
 

 

-

-

+
+

Or, Build from source manually

Useful if the Pip build doesn’t work and you want to debug it, or you want to contribute to the project.

@@ -118,7 +123,7 @@ fixed it, a PR.)

Manual instructions follow, but may be outdated, so see also how we actually build the wheels at https://github.com/electronstudio/raylib-python-cffi/blob/master/.github/workflows/build.yml

-
+

Windows manual build

Clone this repo including submodules so you get correct version of Raylib.

@@ -154,13 +159,13 @@ Raylib.

Would be useful if some Windows user could figure out how to auto detect this.

Then install it:

-
pip3 install dist\raylib-3.7.0-cp37-cp37m-win_amd64.whl
+
pip3 install dist\raylib-3.7.0-cp37-cp37m-win_amd64.whl
 

 

 
(Note: your wheel’s filename will probably be different than the one
 here.)

-
-
+
+

Linux manual build

Clone this repo including submodules so you get correct version of Raylib.

@@ -173,7 +178,7 @@ Raylib.

You can instead use a different version of Raylib you installed from elsewhere, and it should still work!

-
sudo apt install cmake libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev
+
sudo apt install cmake libasound2-dev mesa-common-dev libx11-dev libxrandr-dev libxi-dev xorg-dev libgl1-mesa-dev libglu1-mesa-dev pkg-config cmake
 cd raylib-python-cffi/raylib-c
 mkdir build
 cd build
@@ -195,7 +200,7 @@ work!

 
cd ../..
 

 

-
Build

+
Build the Python library:

 
pip3 install cffi
 rm -rf build raylib/_raylib_cffi.*
 python3 raylib/build.py
@@ -233,8 +238,8 @@ work!

 
Separate the instructions for preparing the dynamic module
 from the instructions for building the static module!

 

-

-

+
+

 
Macos manual build

 
These instructions have been tested on Macos 10.14.

 
Clone this repo including submodules so you get correct version of
@@ -260,44 +265,16 @@ Raylib.

 python3 setup.py install
 

 

-
-
-

Raspberry Pi

-

Latest info: https://github.com/electronstudio/raylib-python-cffi/issues/55#issuecomment-1012629701

-

Old possibly out of date info that was written for RPi3 and Raylib 3 follows.

-

The integrated GPU hardware in a Raspberry Pi (“VideoCore”) is rather -idiosyncratic, resulting in a complex set of software options. Probably -the most interesting two options for Raylib applications are:

-
    -

  1. Use the Broadcom proprietary Open GL ES 2.0 drivers, installed by -Raspbian into /opt/vc. These are 32-bit only, and currently X11 -doesn’t use these for its acceleration, so this is most suitable for -driving the entire HDMI output from one application with minimal -overhead (no X11).

    2. -

  2. Use the more recent open-source vc4-fkms-v3d kernel driver. This -can run in either 32-bit or 64-bit, and X11 can use these, so using -X11 is probably the more common choice here.

    3. -
-

With option 2, the regular linux install instructions above should -probably work as-is.

-

For option 1, then also follow the above instructions, but with these -modifications:

-
    -

  • With cmake, use -cmake -DWITH_PIC=on -DSTATIC=on -DSHARED=on -DPLATFORM='Raspberry Pi' ..

    • -
-

(See -here -for a Raspberry Pi wheel)

-
-
-
+ + +