Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.

Browse Source
This commit is contained in:
Campbell Barton
2012-06-23 13:42:14 +00:00
parent 79fb3311a3
commit 263be14811
8 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
CMakeLists.txt
View File

@@ -159,7 +159,7 @@ unset(PLATFORM_DEFAULT)
if(UNIX AND NOT APPLE) if(UNIX AND NOT APPLE)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON) 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_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 # freebsd doesn't seems to support XDND
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD")
@@ -167,7 +167,7 @@ if(UNIX AND NOT APPLE)
endif() endif()
else() else()
# not an option for other OS's # not an option for other OS's
set(WITH_BUILTIN_GLEW ON) set(WITH_SYSTEM_GLEW OFF)
endif() endif()
# Modifiers # Modifiers
@@ -1540,20 +1540,20 @@ endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
# Configure GLEW # Configure GLEW
if(WITH_BUILTIN_GLEW) if(WITH_SYSTEM_GLEW)
# set(GLEW_LIBRARY "") # unused
set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
else()
find_package(GLEW) find_package(GLEW)
if(NOT GLEW_FOUND) 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() endif()
mark_as_advanced( mark_as_advanced(
GLEW_LIBRARY GLEW_LIBRARY
GLEW_INCLUDE_PATH GLEW_INCLUDE_PATH
) )
else()
# set(GLEW_LIBRARY "") # unused
set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
endif() endif()
#----------------------------------------------------------------------------- #-----------------------------------------------------------------------------
@@ -1791,7 +1791,7 @@ if(FIRST_RUN)
info_cfg_option(WITH_INSTALL_PORTABLE) info_cfg_option(WITH_INSTALL_PORTABLE)
info_cfg_option(WITH_X11_XF86VMODE) info_cfg_option(WITH_X11_XF86VMODE)
info_cfg_option(WITH_X11_XINPUT) 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_option(WITH_MEM_JEMALLOC)
info_cfg_text("Image Formats:") info_cfg_text("Image Formats:")

2
build_files/cmake/config/blender_lite.cmake
View File

@@ -6,9 +6,9 @@
# #
set(WITH_INSTALL_PORTABLE ON CACHE FORCE BOOL) 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_BUILDINFO OFF CACHE FORCE BOOL)
set(WITH_BUILTIN_GLEW OFF CACHE FORCE BOOL)
set(WITH_BULLET OFF CACHE FORCE BOOL) set(WITH_BULLET OFF CACHE FORCE BOOL)
set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL) set(WITH_CODEC_FFMPEG OFF CACHE FORCE BOOL)
set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL) set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL)

2
build_files/cmake/macros.cmake
View File

@@ -253,7 +253,7 @@ macro(setup_liblinks
endif() endif()
endif() endif()
if(NOT WITH_BUILTIN_GLEW) if(WITH_SYSTEM_GLEW)
target_link_libraries(${target} ${GLEW_LIBRARY}) target_link_libraries(${target} ${GLEW_LIBRARY})
endif() endif()

2
extern/CMakeLists.txt vendored
View File

@@ -40,7 +40,7 @@ if(WITH_BINRELOC)
add_subdirectory(binreloc) add_subdirectory(binreloc)
endif() endif()
if(WITH_BUILTIN_GLEW) if(NOT WITH_SYSTEM_GLEW)
add_subdirectory(glew) add_subdirectory(glew)
endif() endif()

6
intern/cycles/cmake/external_libs.cmake
View File

@@ -11,10 +11,10 @@ if(WITH_CYCLES_TEST)
include_directories(${GLUT_INCLUDE_DIR}) include_directories(${GLUT_INCLUDE_DIR})
endif() endif()
if(WITH_BUILTIN_GLEW) if(WITH_SYSTEM_GLEW)
set(CYCLES_GLEW_LIBRARY extern_glew)
else()
set(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY}) set(CYCLES_GLEW_LIBRARY ${GLEW_LIBRARY})
else()
set(CYCLES_GLEW_LIBRARY extern_glew)
endif() endif()
########################################################################### ###########################################################################

1
source/blender/blenlib/intern/math_color_inline.c
View File

@@ -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; 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]) MINLINE float rgb_to_luma(const float rgb[3])
{ {
return 0.299f * rgb[0] + 0.587f * rgb[1] + 0.114f * rgb[2]; return 0.299f * rgb[0] + 0.587f * rgb[1] + 0.114f * rgb[2];

2
source/blenderplayer/CMakeLists.txt
View File

@@ -153,7 +153,7 @@ endif()
list(APPEND BLENDER_SORTED_LIBS extern_eltopo) list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
endif() endif()
if(WITH_BUILTIN_GLEW) if(NOT WITH_SYSTEM_GLEW)
list(APPEND BLENDER_SORTED_LIBS extern_glew) list(APPEND BLENDER_SORTED_LIBS extern_glew)
endif() endif()

2
source/creator/CMakeLists.txt
View File

@@ -908,7 +908,7 @@ endif()
list(APPEND BLENDER_SORTED_LIBS extern_eltopo) list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
endif() endif()
if(WITH_BUILTIN_GLEW) if(NOT WITH_SYSTEM_GLEW)
list(APPEND BLENDER_SORTED_LIBS extern_glew) list(APPEND BLENDER_SORTED_LIBS extern_glew)
endif() endif()