Zengtudor/glew-cmake
1
0
Fork 0
mirror of https://github.com/Perlmint/glew-cmake.git synced 2025-02-18 14:40:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/nigels-com/glew.git into master HEAD at Fri Mar 20 17:44:12 GMT 2015

Browse Source
This commit is contained in:
omniavinco 2015-03-21 02:44:12 +09:00
commit 69e31e274f
2 changed files with 40 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
auto/src/glewinfo_tail.c
View File

@ -185,26 +185,34 @@ void glewDestroyContext ()
#elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX) #elif defined(__APPLE__) && !defined(GLEW_APPLE_GLX)
#include <AGL/agl.h> #include <OpenGL/OpenGL.h>
#include <OpenGL/CGLTypes.h>
AGLContext ctx, octx; CGLContextObj ctx, octx;
GLboolean glewCreateContext () GLboolean glewCreateContext ()
{ {
int attrib[] = { AGL_RGBA, AGL_NONE }; const CGLPixelFormatAttribute attrib[4] =
AGLPixelFormat pf; {
/*int major, minor; kCGLPFAAccelerated, /* No software rendering */
SetPortWindowPort(wnd); #if 0
aglGetVersion(&major, &minor); kCGLPFAOpenGLProfile, /* OSX 10.7 Lion onwards */
fprintf(stderr, "GL %d.%d\n", major, minor);*/ (CGLPixelFormatAttribute) kCGLOGLPVersion_3_2_Core, /* 3.2 Core Context */
pf = aglChoosePixelFormat(NULL, 0, attrib); #endif
if (NULL == pf) return GL_TRUE; 0
ctx = aglCreateContext(pf, NULL); };
if (NULL == ctx || AGL_NO_ERROR != aglGetError()) return GL_TRUE; CGLPixelFormatObj pf;
aglDestroyPixelFormat(pf); GLint npix;
/*aglSetDrawable(ctx, GetWindowPort(wnd));*/ CGLError error;
octx = aglGetCurrentContext();
if (GL_FALSE == aglSetCurrentContext(ctx)) return GL_TRUE; 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 */ /* Needed for Regal on the Mac */
#if defined(GLEW_REGAL) && defined(__APPLE__) #if defined(GLEW_REGAL) && defined(__APPLE__)
RegalMakeCurrent(ctx); RegalMakeCurrent(ctx);
@ -214,8 +222,8 @@ GLboolean glewCreateContext ()
void glewDestroyContext () void glewDestroyContext ()
{ {
aglSetCurrentContext(octx); CGLSetCurrentContext(octx);
if (NULL != ctx) aglDestroyContext(ctx); CGLReleaseContext(ctx);
} }
/* ------------------------------------------------------------------------ */ /* ------------------------------------------------------------------------ */

25
build/cmake/CMakeLists.txt
View File

@ -12,10 +12,17 @@ endif()
option (BUILD_UTILS "utilities" ON) option (BUILD_UTILS "utilities" ON)
set (GLEW_VERSION "1.12.0")
set (GLEW_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../..) 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_ARCHIVE_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib) set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin) set (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
@ -30,27 +37,23 @@ endif ()
find_package (OpenGL REQUIRED) find_package (OpenGL REQUIRED)
set (GLEW_LIBRARIES ${OPENGL_LIBRARIES}) set (GLEW_LIBRARIES ${OPENGL_LIBRARIES})
add_definitions (-DGLEW_BUILD -DGLEW_NO_GLU) add_definitions (-DGLEW_NO_GLU)
include_directories (${GLEW_DIR}/include) include_directories (${GLEW_DIR}/include)
add_library (glew SHARED ${GLEW_DIR}/src/glew.c) 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) 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 ${GLEW_LIBRARIES})
target_link_libraries (glew_s ${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 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 ) 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 ${GLEW_LIBRARIES})
target_link_libraries (glewmx_s ${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 install ( TARGETS glew glew_s glewmx glewmx_s
RUNTIME DESTINATION bin RUNTIME DESTINATION bin