Merge https://github.com/nigels-com/glew.git into master HEAD at Sat May 21 17:44:35 GMT 2016

This commit is contained in:
omniavinco 2016-05-22 02:44:35 +09:00
commit faf403280c
2 changed files with 10 additions and 2 deletions

View File

@ -114,8 +114,8 @@ if __name__ == '__main__':
dom = parse(i) dom = parse(i)
api = findApi(dom, 'egl') api = findApi(dom, 'egl')
print 'Found {} enums, {} commands, {} features and {} extensions.'.format( print('Found {} enums, {} commands, {} features and {} extensions.'.format(
len(api[0]), len(api[1]), len(api[2]), len(api[3])) len(api[0]), len(api[1]), len(api[2]), len(api[3])))
if len(options.core): if len(options.core):
for i in api[2].keys(): for i in api[2].keys():

View File

@ -191,6 +191,14 @@ install(FILES ${GLEW_DIR}/glew.pc
DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
) )
if(WIN32 AND (NOT MSVC_VERSION LESS 1600) AND (NOT CMAKE_VERSION VERSION_LESS "3.1"))
install(
FILES $<TARGET_PDB_FILE:glew>
DESTINATION ${CMAKE_INSTALL_LIBDIR}
CONFIGURATIONS Debug RelWithDebInfo
)
endif()
install (FILES install (FILES
${GLEW_DIR}/include/GL/wglew.h ${GLEW_DIR}/include/GL/wglew.h
${GLEW_DIR}/include/GL/glew.h ${GLEW_DIR}/include/GL/glew.h