Merge remote-tracking branch 'svn/trunk' into git_master

This commit is contained in:
Diederick Niehorster 2014-12-25 22:36:11 +08:00
commit be6d4f0d39
2 changed files with 25 additions and 9 deletions

View File

@ -50,7 +50,9 @@ ENDIF()
OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF) OPTION(FREEGLUT_GLES "Use OpenGL ES (requires EGL)" OFF)
# option to build either as "glut" (ON) or "freeglut" (OFF) # option to build either as "glut" (ON) or "freeglut" (OFF)
OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON) IF(NOT WIN32)
OPTION(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON)
ENDIF()
SET(FREEGLUT_HEADERS SET(FREEGLUT_HEADERS

View File

@ -50,11 +50,25 @@ How to build freeglut on UNIX
Breakdown of CMake configuration options Breakdown of CMake configuration options
---------------------------------------- ----------------------------------------
BUILD_SHARED_LIBS [ON, OFF] Build freeglut as a shared library CMAKE_BUILD_TYPE [Empty, Debug, Release] Can be overriden by
BUILD_STATIC_LIBS [ON, OFF] Build freeglut as a static library passing it as a make variable during build.
CMAKE_BUILD_TYPE [Empty, Debug, Release] Can be overriden by passing it
as a make variable during build.
CMAKE_INSTALL_PREFIX Installation prefix (e.g. /usr/local on UNIX) CMAKE_INSTALL_PREFIX Installation prefix (e.g. /usr/local on UNIX)
FREEGLUT_BUILD_DEMOS [ON, OFF] Controls whether the demos are built or not. FREEGLUT_BUILD_DEMOS [ON, OFF] Controls whether the demos are
FREEGLUT_GLES1 [ON, OFF] TODO built or not.
FREEGLUT_GLES2 [ON, OFF] TODO 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_GLES [ON, OFF] Link with GLEs libraries instead
of OpenGL
FREEGLUT_PRINT_ERRORS [ON, OFF] Controls whether errors are
default handled or not when user does not
provide an error callback
FREEGLUT_PRINT_WARNINGS [ON, OFF] Controls whether warnings are
default handled or not when user does not
provide an warning callback
FREEGLUT_REPLACE_GLUT [ON, OFF] For non-Windows platforms,
freeglut is by default built as -lglut. if
off, built as -lfreeglut. On Windows,
libraries are always built as freeglut.
INSTALL_PDB [ON, OFF] MSVC only: controls whether debug
information files are included with the
install or not