[Bf-blender-cvs] [225b02f] master: Fix for building ghost-tests

[Campbell Barton]

Commit: 225b02fcd66052b1d6dfa4a146798e41c44e0cd4
Author: Campbell Barton
Date:   Mon Dec 28 21:40:49 2015 +1100
Branches: master
https://developer.blender.org/rB225b02fcd66052b1d6dfa4a146798e41c44e0cd4

Fix for building ghost-tests

===================================================================

M	intern/ghost/test/CMakeLists.txt
M	source/blender/blenfont/intern/blf.c

===================================================================

diff --git a/intern/ghost/test/CMakeLists.txt b/intern/ghost/test/CMakeLists.txt
index e147596..fb9ef62 100644
--- a/intern/ghost/test/CMakeLists.txt
+++ b/intern/ghost/test/CMakeLists.txt
@@ -79,6 +79,8 @@ if(UNIX AND NOT APPLE)
 endif()
 # for now... default to this
 add_definitions(-DWITH_GL_PROFILE_COMPAT)
+# BLF needs this to ignore GPU library
+add_definitions(-DBLF_STANDALONE)
 
 # ghost
 include(${CMAKE_SOURCE_DIR}/../CMakeLists.txt)
diff --git a/source/blender/blenfont/intern/blf.c b/source/blender/blenfont/intern/blf.c
index a387b26..977fa77 100644
--- a/source/blender/blenfont/intern/blf.c
+++ b/source/blender/blenfont/intern/blf.c
@@ -55,7 +55,9 @@
 
 #include "IMB_colormanagement.h"
 
+#ifndef BLF_STANDALONE
 #include "GPU_basic_shader.h"
+#endif
 
 #include "blf_internal_types.h"
 #include "blf_internal.h"
@@ -498,7 +500,9 @@ static void blf_draw_gl__start(FontBLF *font, GLint *mode)
 	glEnable(GL_BLEND);
 	glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
+#ifndef BLF_STANDALONE
 	GPU_basic_shader_bind(GPU_SHADER_TEXTURE_2D | GPU_SHADER_USE_COLOR);
+#endif
 
 	/* Save the current matrix mode. */
 	glGetIntegerv(GL_MATRIX_MODE, mode);
@@ -539,7 +543,9 @@ static void blf_draw_gl__end(GLint mode)
 	if (mode != GL_MODELVIEW)
 		glMatrixMode(mode);
 
+#ifndef BLF_STANDALONE
 	GPU_basic_shader_bind(GPU_SHADER_USE_COLOR);
+#endif
 	glDisable(GL_BLEND);
 }