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

This commit is contained in:
Diederick Niehorster 2014-12-25 08:55:10 +08:00
commit a1e180a21a

View File

@ -49,6 +49,9 @@ ENDIF()
# OpenGL ES support # OpenGL ES support
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(FREEGLUT_REPLACE_GLUT "Be a replacement for GLUT" ON)
SET(FREEGLUT_HEADERS SET(FREEGLUT_HEADERS
include/GL/freeglut.h include/GL/freeglut.h
@ -366,13 +369,18 @@ ELSE()
# the lack of support for current:revision:age in CMake should # the lack of support for current:revision:age in CMake should
# not be a problem. # not be a problem.
# - the output library should be named glut so it'll be linkable with -lglut # - the output library should be named glut so it'll be linkable with -lglut
# (unless FREEGLUT_REPLACE_GLUT is false).
# - the shared library should link to the dependency libraries so that the user # - the shared library should link to the dependency libraries so that the user
# won't have to link them explicitly (they shouldn't have to know that we depend # won't have to link them explicitly (they shouldn't have to know that we depend
# on Xrandr or Xxf86vm) # on Xrandr or Xxf86vm)
IF(FREEGLUT_GLES) IF(FREEGLUT_GLES)
SET(LIBNAME freeglut-gles) SET(LIBNAME freeglut-gles)
ELSE() ELSE()
IF(FREEGLUT_REPLACE_GLUT)
SET(LIBNAME glut) SET(LIBNAME glut)
ELSE()
SET(LIBNAME freeglut)
ENDIF()
ENDIF() ENDIF()
IF(FREEGLUT_BUILD_SHARED_LIBS) IF(FREEGLUT_BUILD_SHARED_LIBS)