Merge pull request #40 from Tarnyko/git_master

Mention Wayland build requirements in documentation
This commit is contained in:
Diederick C. Niehorster 2015-12-14 17:20:48 +01:00
commit 49921da0d0
3 changed files with 14 additions and 5 deletions

View File

@ -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

View File

@ -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)

View File

@ -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