[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36025] trunk/blender: correction for last commit, in some cases it still used the local glut. h header.

[Campbell Barton]

Revision: 36025
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36025
Author:   campbellbarton
Date:     2011-04-05 23:55:52 +0000 (Tue, 05 Apr 2011)
Log Message:
-----------
correction for last commit, in some cases it still used the local glut.h header.

Modified Paths:
--------------
    trunk/blender/CMakeLists.txt
    trunk/blender/source/blender/editors/include/BIF_gl.h
    trunk/blender/source/blender/makesrna/SConscript
    trunk/blender/source/blender/makesrna/intern/SConscript

Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt	2011-04-05 23:31:01 UTC (rev 36024)
+++ trunk/blender/CMakeLists.txt	2011-04-05 23:55:52 UTC (rev 36025)
@@ -1032,9 +1032,13 @@
 	set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include")
 else()
 	find_package(GLEW)
+
 	if(NOT GLEW_FOUND)
 		message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW")
 	endif()
+
+	mark_as_advanced(GLEW_LIBRARY)
+	mark_as_advanced(GLEW_INCLUDE_PATH)
 endif()
 
 #-----------------------------------------------------------------------------

Modified: trunk/blender/source/blender/editors/include/BIF_gl.h
===================================================================
--- trunk/blender/source/blender/editors/include/BIF_gl.h	2011-04-05 23:31:01 UTC (rev 36024)
+++ trunk/blender/source/blender/editors/include/BIF_gl.h	2011-04-05 23:55:52 UTC (rev 36025)
@@ -35,7 +35,7 @@
 #ifndef BIF_GL_H
 #define BIF_GL_H
 
-#include "../../../../extern/glew/include/GL/glew.h"
+#include "GL/glew.h"
 
 	/*
 	 * these should be phased out. cpack should be replaced in

Modified: trunk/blender/source/blender/makesrna/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/SConscript	2011-04-05 23:31:01 UTC (rev 36024)
+++ trunk/blender/source/blender/makesrna/SConscript	2011-04-05 23:55:52 UTC (rev 36025)
@@ -9,6 +9,7 @@
 incs = '#/intern/guardedalloc #/intern/memutil #/intern/audaspace/intern ../blenkernel ../blenlib ../makesdna intern .'
 incs += ' ../windowmanager ../editors/include ../gpu ../imbuf ../ikplugin ../blenfont ../blenloader'
 incs += ' ../render/extern/include'
+incs += ' #/extern/glew/include'
 
 defs = []
 

Modified: trunk/blender/source/blender/makesrna/intern/SConscript
===================================================================
--- trunk/blender/source/blender/makesrna/intern/SConscript	2011-04-05 23:31:01 UTC (rev 36024)
+++ trunk/blender/source/blender/makesrna/intern/SConscript	2011-04-05 23:55:52 UTC (rev 36025)
@@ -34,6 +34,7 @@
 incs += ' ../../windowmanager ../../editors/include ../../blenfont'
 incs += ' ../../render/extern/include'
 incs += ' #/intern/audaspace/intern '
+incs += ' #/extern/glew/include '
 
 if env['WITH_BF_OPENEXR']:
     defs.append('WITH_OPENEXR')