From 9a8e815da87c016a67afdc042cafd90bd1d6ffc2 Mon Sep 17 00:00:00 2001 From: xantares Date: Thu, 26 Feb 2015 10:54:39 +0000 Subject: [PATCH 1/4] [cmake] get version from config/version --- build/cmake/CMakeLists.txt | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 4a1cbd6..ef84ad2 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -12,10 +12,17 @@ endif() option (BUILD_UTILS "utilities" ON) -set (GLEW_VERSION "1.12.0") - set (GLEW_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) +# get version from config/version +file (STRINGS ${GLEW_DIR}/config/version _VERSION_MAJOR_STRING REGEX "GLEW_MAJOR[ ]*=[ ]*[0-9]+.*") +string (REGEX REPLACE "GLEW_MAJOR[ ]*=[ ]*([0-9]+)" "\\1" CPACK_PACKAGE_VERSION_MAJOR ${_VERSION_MAJOR_STRING}) +file (STRINGS ${GLEW_DIR}/config/version _VERSION_MINOR_STRING REGEX "GLEW_MINOR[ ]*=[ ]*[0-9]+.*") +string (REGEX REPLACE "GLEW_MINOR[ ]*=[ ]*([0-9]+)" "\\1" CPACK_PACKAGE_VERSION_MINOR ${_VERSION_MINOR_STRING}) +file (STRINGS ${GLEW_DIR}/config/version _VERSION_PATCH_STRING REGEX "GLEW_MICRO[ ]*=[ ]*[0-9]+.*") +string (REGEX REPLACE "GLEW_MICRO[ ]*=[ ]*([0-9]+)" "\\1" CPACK_PACKAGE_VERSION_PATCH ${_VERSION_PATCH_STRING}) +set (GLEW_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}) + set (CMAKE_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) From 516c9adf41eca4f9ed2ea3410239b21c58481854 Mon Sep 17 00:00:00 2001 From: xantares Date: Thu, 26 Feb 2015 11:00:25 +0000 Subject: [PATCH 2/4] set right export definitions for shared/static libs --- build/cmake/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index ef84ad2..00156f5 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -37,18 +37,16 @@ endif () find_package (OpenGL REQUIRED) set (GLEW_LIBRARIES ${OPENGL_LIBRARIES}) -add_definitions (-DGLEW_BUILD -DGLEW_NO_GLU) +add_definitions (-DGLEW_NO_GLU) include_directories (${GLEW_DIR}/include) add_library (glew SHARED ${GLEW_DIR}/src/glew.c) +set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX "${DLL_PREFIX}") add_library (glew_s STATIC ${GLEW_DIR}/src/glew.c) +set_target_properties (glew_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX lib) target_link_libraries (glew ${GLEW_LIBRARIES}) target_link_libraries (glew_s ${GLEW_LIBRARIES}) -set_target_properties (glew PROPERTIES OUTPUT_NAME ${GLEW_LIB_NAME}) -set_target_properties (glew_s PROPERTIES OUTPUT_NAME ${GLEW_LIB_NAME}) -set_target_properties (glew PROPERTIES PREFIX "${DLL_PREFIX}") -set_target_properties (glew_s PROPERTIES PREFIX lib) add_library(glewmx SHARED ${GLEW_DIR}/src/glew.c ) add_library(glewmx_s STATIC ${GLEW_DIR}/src/glew.c ) From b565769b01119de1e66698f07b00d2cff3de3f4b Mon Sep 17 00:00:00 2001 From: xantares Date: Thu, 26 Feb 2015 11:10:12 +0000 Subject: [PATCH 3/4] fix compile definitions for glewmx too --- build/cmake/CMakeLists.txt | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build/cmake/CMakeLists.txt b/build/cmake/CMakeLists.txt index 00156f5..e08fe62 100644 --- a/build/cmake/CMakeLists.txt +++ b/build/cmake/CMakeLists.txt @@ -42,20 +42,18 @@ add_definitions (-DGLEW_NO_GLU) include_directories (${GLEW_DIR}/include) add_library (glew SHARED ${GLEW_DIR}/src/glew.c) -set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX "${DLL_PREFIX}") +set_target_properties (glew PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX "${DLL_PREFIX}") add_library (glew_s STATIC ${GLEW_DIR}/src/glew.c) set_target_properties (glew_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC" OUTPUT_NAME "${GLEW_LIB_NAME}" PREFIX lib) target_link_libraries (glew ${GLEW_LIBRARIES}) target_link_libraries (glew_s ${GLEW_LIBRARIES}) add_library(glewmx SHARED ${GLEW_DIR}/src/glew.c ) +set_target_properties (glewmx PROPERTIES COMPILE_DEFINITIONS "GLEW_BUILD;GLEW_MX" OUTPUT_NAME "${GLEW_LIB_NAME}mx" PREFIX "${DLL_PREFIX}") add_library(glewmx_s STATIC ${GLEW_DIR}/src/glew.c ) +set_target_properties (glewmx_s PROPERTIES COMPILE_DEFINITIONS "GLEW_STATIC;GLEW_MX" OUTPUT_NAME "${GLEW_LIB_NAME}mx" PREFIX lib) target_link_libraries (glewmx ${GLEW_LIBRARIES}) target_link_libraries (glewmx_s ${GLEW_LIBRARIES}) -set_target_properties (glewmx PROPERTIES COMPILE_FLAGS "-DGLEW_MX" OUTPUT_NAME ${GLEW_LIB_NAME}mx) -set_target_properties (glewmx_s PROPERTIES COMPILE_FLAGS "-DGLEW_MX" OUTPUT_NAME ${GLEW_LIB_NAME}mx) -set_target_properties (glewmx PROPERTIES PREFIX "${DLL_PREFIX}") -set_target_properties (glewmx_s PROPERTIES PREFIX lib) install ( TARGETS glew glew_s glewmx glewmx_s RUNTIME DESTINATION bin From 573eeabd8e04fbe65be656165a6158eed0c33f79 Mon Sep 17 00:00:00 2001 From: Nigel Stewart Date: Sat, 21 Feb 2015 20:53:05 +1000 Subject: [PATCH 4/4] [Mac] Migrate glewinfo on Mac from AGL to CGL, with the possibility of running in (core) OpenGL 3.2 mode. --- auto/src/glewinfo_tail.c | 44 ++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/auto/src/glewinfo_tail.c b/auto/src/glewinfo_tail.c index a2b184a..b48a3f1 100644 --- a/auto/src/glewinfo_tail.c +++ b/auto/src/glewinfo_tail.c @@ -185,26 +185,34 @@ void glewDestroyContext () #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) -#include +#include +#include -AGLContext ctx, octx; +CGLContextObj ctx, octx; GLboolean glewCreateContext () { - int attrib[] = { AGL_RGBA, AGL_NONE }; - AGLPixelFormat pf; - /*int major, minor; - SetPortWindowPort(wnd); - aglGetVersion(&major, &minor); - fprintf(stderr, "GL %d.%d\n", major, minor);*/ - pf = aglChoosePixelFormat(NULL, 0, attrib); - if (NULL == pf) return GL_TRUE; - ctx = aglCreateContext(pf, NULL); - if (NULL == ctx || AGL_NO_ERROR != aglGetError()) return GL_TRUE; - aglDestroyPixelFormat(pf); - /*aglSetDrawable(ctx, GetWindowPort(wnd));*/ - octx = aglGetCurrentContext(); - if (GL_FALSE == aglSetCurrentContext(ctx)) return GL_TRUE; + const CGLPixelFormatAttribute attrib[4] = + { + kCGLPFAAccelerated, /* No software rendering */ +#if 0 + kCGLPFAOpenGLProfile, /* OSX 10.7 Lion onwards */ + (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core, /* 3.2 Core Context */ +#endif + 0 + }; + CGLPixelFormatObj pf; + GLint npix; + CGLError error; + + error = CGLChoosePixelFormat(attrib, &pf, &npix); + if (error) return GL_TRUE; + error = CGLCreateContext(pf, NULL, &ctx); + if (error) return GL_TRUE; + CGLReleasePixelFormat(pf); + octx = CGLGetCurrentContext(); + error = CGLSetCurrentContext(ctx); + if (error) return GL_TRUE; /* Needed for Regal on the Mac */ #if defined(GLEW_REGAL) && defined(__APPLE__) RegalMakeCurrent(ctx); @@ -214,8 +222,8 @@ GLboolean glewCreateContext () void glewDestroyContext () { - aglSetCurrentContext(octx); - if (NULL != ctx) aglDestroyContext(ctx); + CGLSetCurrentContext(octx); + CGLReleaseContext(ctx); } /* ------------------------------------------------------------------------ */