Merge https://github.com/nigels-com/glew.git into master HEAD at Sun Apr 3 17:44:19 GMT 2016

This commit is contained in:
omniavinco 2016-04-04 02:44:19 +09:00
commit c63ddd98f4
2 changed files with 22 additions and 6 deletions

View File

@ -28,7 +28,7 @@ Snapshots may contain new features, bug-fixes or new OpenGL extensions ahead of
*GLEW 2.0.0 release candidate, Core context, EGL support, no MX* *GLEW 2.0.0 release candidate, Core context, EGL support, no MX*
[glew-20160131.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20160131.tgz/download) [glew-20160131.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20160131.tgz/download)
*GLEW 2.0.0 release candidate: Core context support, MX discontinued* *GLEW 2.0.0 release candidate: Core context support, no MX*
[glew-20151117.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20151117.tgz/download) [glew-20151117.tgz](http://sourceforge.net/projects/glew/files/glew/snapshots/glew-20151117.tgz/download)
@ -72,6 +72,23 @@ RedHat/CentOS/Fedora: `$ sudo yum install libXmu-devel libXi-devel libGL-devel g
$ cmake ./cmake $ cmake ./cmake
$ make -j4 $ make -j4
| Target | Description |
| ---------- | ----------- |
| glew | Build the glew shared library. |
| glew_s | Build the glew static library. |
| glewinfo | Build the `glewinfo` executable (requires `BUILD_UTILS` to be `ON`). |
| visualinfo | Build the `visualinfo` executable (requires `BUILD_UTILS` to be `ON`). |
| install | Install all enabled targets into `CMAKE_INSTALL_PREFIX`. |
| clean | Clean up build artifacts. |
| all | Build all enabled targets (default target). |
| Variables | Description |
| --------------- | ----------- |
| BUILD_UTILS | Build the `glewinfo` and `visualinfo` executables. |
| GLEW_REGAL | Build in Regal mode. |
| GLEW_OSMESA | Build in off-screen Mesa mode. |
| BUILD_FRAMEWORK | Build as MacOSX Framework. Setting `CMAKE_INSTALL_PREFIX` to `/Library/Frameworks` is recommended. |
### Windows ### Windows
#### Visual Studio #### Visual Studio

View File

@ -149,7 +149,7 @@ install ( TARGETS ${targets_to_install}
RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
FRAMEWORK DESTINATION lib${LIB_SUFFIX} FRAMEWORK DESTINATION ${CMAKE_INSTALL_PREFIX}
) )
if (BUILD_UTILS) if (BUILD_UTILS)
@ -178,10 +178,9 @@ if (BUILD_UTILS)
endif () endif ()
set (prefix ${CMAKE_INSTALL_PREFIX}) set (prefix ${CMAKE_INSTALL_PREFIX})
set (exec_prefix \${prefix}) set (exec_prefix ${CMAKE_INSTALL_PREFIX})
set (libdir \${prefix}/lib) set (libdir ${CMAKE_INSTALL_FULL_LIBDIR})
set (includedir \${prefix}/include) set (includedir ${CMAKE_INSTALL_FULL_INCLUDEDIR})
set (includedir \${prefix}/include)
set (version ${GLEW_VERSION}) set (version ${GLEW_VERSION})
set (libname ${GLEW_LIB_NAME}) set (libname ${GLEW_LIB_NAME})
set (cflags) set (cflags)