From 263be14811c65ee67646308b116c6afd8f817384 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Sat, 23 Jun 2012 13:42:14 +0000 Subject: rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate. --- CMakeLists.txt | 16 ++++++++-------- build_files/cmake/config/blender_lite.cmake | 2 +- build_files/cmake/macros.cmake | 2 +- extern/CMakeLists.txt | 2 +- intern/cycles/cmake/external_libs.cmake | 6 +++--- source/blender/blenlib/intern/math_color_inline.c | 1 + source/blenderplayer/CMakeLists.txt | 2 +- source/creator/CMakeLists.txt | 2 +- 8 files changed, 17 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 824ccc72244..b983a5556f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,7 @@ unset(PLATFORM_DEFAULT) if(UNIX AND NOT APPLE) option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON) option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON) - option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON) + option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON) # freebsd doesn't seems to support XDND if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") @@ -167,7 +167,7 @@ if(UNIX AND NOT APPLE) endif() else() # not an option for other OS's - set(WITH_BUILTIN_GLEW ON) + set(WITH_SYSTEM_GLEW OFF) endif() # Modifiers @@ -1540,20 +1540,20 @@ endif() #----------------------------------------------------------------------------- # Configure GLEW -if(WITH_BUILTIN_GLEW) - # set(GLEW_LIBRARY "") # unused - set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include") -else() +if(WITH_SYSTEM_GLEW) find_package(GLEW) if(NOT GLEW_FOUND) - message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW") + message(FATAL_ERROR "GLEW is required to build blender, install it or disable WITH_SYSTEM_GLEW") endif() mark_as_advanced( GLEW_LIBRARY GLEW_INCLUDE_PATH ) +else() + # set(GLEW_LIBRARY "") # unused + set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include") endif() #----------------------------------------------------------------------------- @@ -1791,7 +1791,7 @@ if(FIRST_RUN) info_cfg_option(WITH_INSTALL_PORTABLE) info_cfg_option(WITH_X11_XF86VMODE) info_cfg_option(WITH_X11_XINPUT) - info_cfg_option(WITH_BUILTIN_GLEW) + info_cfg_option(WITH_SYSTEM_GLEW) info_cfg_option(WITH_MEM_JEMALLOC) info_cfg_text("Image Formats:") diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index d19f0cf32e8..e2adc17a2e8 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -6,9 +6,9 @@ # set(WITH_INSTALL_PORTABLE ON CACHE FORCE BOOL) +set(WITH_SYSTEM_GLEW ON CACHE FORCE BOOL) set(WITH_BUILDINFO OFF CACHE FORCE BOOL) -set(WITH_BUILTIN_GLEW OFF CACHE FORCE BOOL) set(WITH_BULLET OFF CACHE FORCE BOOL) set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL) set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL) diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake index 2b61ddca648..6939f21d461 100644 --- a/build_files/cmake/macros.cmake +++ b/build_files/cmake/macros.cmake @@ -253,7 +253,7 @@ macro(setup_liblinks endif() endif() - if(NOT WITH_BUILTIN_GLEW) + if(WITH_SYSTEM_GLEW) target_link_libraries(${target} ${GLEW_LIBRARY}) endif() diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index 1d83410a3d7..67a899082e2 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -40,7 +40,7 @@ if(WITH_BINRELOC) add_subdirectory(binreloc) endif() -if(WITH_BUILTIN_GLEW) +if(NOT WITH_SYSTEM_GLEW) add_subdirectory(glew) endif() diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake index 7d12e261068..23a919530f9 100644 --- a/intern/cycles/cmake/external_libs.cmake +++ b/intern/cycles/cmake/external_libs.cmake @@ -11,10 +11,10 @@ if(WITH_CYCLES_TEST) include_directories(${GLUT_INCLUDE_DIR}) endif() -if(WITH_BUILTIN_GLEW) - set(CYCLES_GLEW_LIBRARY extern_glew) -else() +if(WITH_SYSTEM_GLEW) set(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY}) +else() + set(CYCLES_GLEW_LIBRARY extern_glew) endif() ########################################################################### diff --git a/source/blender/blenlib/intern/math_color_inline.c b/source/blender/blenlib/intern/math_color_inline.c index f270a20003d..23d70bd148b 100644 --- a/source/blender/blenlib/intern/math_color_inline.c +++ b/source/blender/blenlib/intern/math_color_inline.c @@ -239,6 +239,7 @@ MINLINE unsigned char rgb_to_grayscale_byte(const unsigned char rgb[3]) return (76 * (unsigned short) rgb[0] + 148 * (unsigned short) rgb[1] + 31 * (unsigned short) rgb[2]) / 255; } +/* luma from defined by 'YCC_JFIF', see #rgb_to_ycc */ MINLINE float rgb_to_luma(const float rgb[3]) { return 0.299f * rgb[0] + 0.587f * rgb[1] + 0.114f * rgb[2]; diff --git a/source/blenderplayer/CMakeLists.txt b/source/blenderplayer/CMakeLists.txt index 99db5576fa0..720d68ef00d 100644 --- a/source/blenderplayer/CMakeLists.txt +++ b/source/blenderplayer/CMakeLists.txt @@ -153,7 +153,7 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_eltopo) endif() - if(WITH_BUILTIN_GLEW) + if(NOT WITH_SYSTEM_GLEW) list(APPEND BLENDER_SORTED_LIBS extern_glew) endif() diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index e8b951f3680..033b1352e51 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -908,7 +908,7 @@ endif() list(APPEND BLENDER_SORTED_LIBS extern_eltopo) endif() - if(WITH_BUILTIN_GLEW) + if(NOT WITH_SYSTEM_GLEW) list(APPEND BLENDER_SORTED_LIBS extern_glew) endif() -- cgit v1.2.3