[Bf-committers] [Patch] Add support for using (dynamically) system-wide FTGL libraries.

[Cyril Brulebois]

On 03/05/2008, Cyril Brulebois wrote:
> Please find attached a patch to add support for BF_FTGL_LIB where (as
> far as I understand it) it belongs.

Updated patch, so that the embedded copy isn't built (additional hunk
touching extern/SConscript). I'm sure it might be written in a more
elegant way, but that's at least sufficient for the default
configuration and BF_FTGL's definition in config/linux2-config.py.

Mraw,
KiBi.
-------------- next part --------------
--- a/source/blender/ftfont/intern/FTF_TTFont.cpp
+++ b/source/blender/ftfont/intern/FTF_TTFont.cpp
@@ -41,6 +41,8 @@
 #include "BKE_utildefines.h"
 #endif
 
+#include <GL/gl.h>
+
 #define DOMAIN_NAME "blender"
 
 #define SYSTEM_ENCODING_DEFAULT "UTF-8"
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -165,6 +165,8 @@
         syslibs += Split(lenv['BF_OPENGL_LIB'])
     if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw','linuxcross'):
         syslibs += Split(lenv['BF_PTHREADS_LIB'])
+    if lenv['WITH_BF_FTGL']:
+        syslibs += Split(lenv['BF_FTGL_LIB'])
 
     syslibs += Split(lenv['LLIBS'])
 
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -10,7 +10,9 @@
     SConscript(['bullet2/src/SConscript'])
 
 if env['WITH_BF_INTERNATIONAL']:
-    SConscript(['bFTGL/SConscript'])
+    # Only if the internal copy is used.
+    if env['BF_FTGL'].startswith('#extern'):
+        SConscript(['bFTGL/SConscript'])
 
 if env['WITH_BF_VERSE']:
     SConscript(['verse/dist/SConstruct'])
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.blender.org/pipermail/bf-committers/attachments/20080504/8c9234e2/attachment.pgp