Mention Wayland build requirements in documentation
Following https://github.com/dcnieho/FreeGLUT/issues/38 ; mention Wayland support in README, Wayland build instructions and requirements in README.cmake. Signed-off-by: Manuel Bachmann <manuel.bachmann@iot.bzh> (cherry picked from commit18773bcc81
) (cherry picked from commit18773bcc81
) git-svn-id: https://svn.code.sf.net/p/freeglut/code/trunk@1780 7f0cb862-5218-0410-a997-914c9d46530a
This commit is contained in:
parent
012736d296
commit
1026c5e915
@ -32,6 +32,9 @@ John Tsiombikas <nuclear@member.fsf.org>
|
|||||||
Sylvain Beucler
|
Sylvain Beucler
|
||||||
support for Android, X11/EGL, OpenGL(ES) 2.x, misc fixes
|
support for Android, X11/EGL, OpenGL(ES) 2.x, misc fixes
|
||||||
|
|
||||||
|
Manuel Bachmann
|
||||||
|
support for Wayland
|
||||||
|
|
||||||
Diederick C. Niehorster
|
Diederick C. Niehorster
|
||||||
Chris Marshall
|
Chris Marshall
|
||||||
Clive McCarthy
|
Clive McCarthy
|
||||||
|
@ -12,7 +12,7 @@ PORTS
|
|||||||
=====
|
=====
|
||||||
|
|
||||||
Currently supported platforms:
|
Currently supported platforms:
|
||||||
- UNIX systems with X11 (such as GNU/Linux, FreeBSD, etc)
|
- UNIX systems with X11 and Wayland (such as GNU/Linux, FreeBSD, etc)
|
||||||
- MS Windows
|
- MS Windows
|
||||||
- MacOS X with XQuartz (no native Cocoa support yet)
|
- MacOS X with XQuartz (no native Cocoa support yet)
|
||||||
- Android (NDK)
|
- Android (NDK)
|
||||||
|
@ -40,10 +40,14 @@ How to build freeglut on UNIX
|
|||||||
- Make sure you have the basics for compiling code, such as C compiler
|
- Make sure you have the basics for compiling code, such as C compiler
|
||||||
(e.g., GCC) and the make package.
|
(e.g., GCC) and the make package.
|
||||||
- Also make sure you have packages installed that provide the relevant
|
- Also make sure you have packages installed that provide the relevant
|
||||||
header files for x11 (including xrandr) and opengl (e.g.,
|
header files for opengl (e.g., libgl1-mesa-dev on Debian/Ubuntu) and
|
||||||
libgl1-mesa-dev, libx11-dev and libxrandr-dev on Debian/Ubuntu).
|
the chosen backend :
|
||||||
- Install XInput: libxi-dev / libXi-devel
|
- X11: x11 (e.g., libx11-dev, libxrandr-devel on Debian/Ubuntu) and
|
||||||
- Run 'cmake .' in the freeglut directory to generate the makefile.
|
XInput (libxi-dev / libXi-devel)
|
||||||
|
- Wayland: wayland (e.g., libwayland-dev and libegl1-mesa-dev on
|
||||||
|
Debian/Ubuntu) and xkbcommon (libxkbcommon-dev /libxkbcommon-devel)
|
||||||
|
- Run 'cmake .' (or 'cmake . -DFREEGLUT_WAYLAND=ON' for Wayland) in the
|
||||||
|
freeglut directory to generate the makefile.
|
||||||
- Run 'make' to build, and 'make install' to install freeglut.
|
- Run 'make' to build, and 'make install' to install freeglut.
|
||||||
- If you wish to change any build options run 'ccmake .'
|
- If you wish to change any build options run 'ccmake .'
|
||||||
|
|
||||||
@ -59,6 +63,8 @@ FREEGLUT_BUILD_SHARED_LIBS [ON, OFF] Build freeglut as a shared library
|
|||||||
FREEGLUT_BUILD_STATIC_LIBS [ON, OFF] Build freeglut as a static library
|
FREEGLUT_BUILD_STATIC_LIBS [ON, OFF] Build freeglut as a static library
|
||||||
FREEGLUT_GLES [ON, OFF] Link with GLEs libraries instead
|
FREEGLUT_GLES [ON, OFF] Link with GLEs libraries instead
|
||||||
of OpenGL
|
of OpenGL
|
||||||
|
FREEGLUT_WAYLAND [ON, OFF] Link with Wayland libraries instead
|
||||||
|
of X11
|
||||||
FREEGLUT_PRINT_ERRORS [ON, OFF] Controls whether errors are
|
FREEGLUT_PRINT_ERRORS [ON, OFF] Controls whether errors are
|
||||||
default handled or not when user does not
|
default handled or not when user does not
|
||||||
provide an error callback
|
provide an error callback
|
||||||
|
Reference in New Issue
Block a user