[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [20102] branches/blender2.5/blender: Tweaks to build systems.

[Kent Mein]

Revision: 20102
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=20102
Author:   sirdude
Date:     2009-05-08 05:49:48 +0200 (Fri, 08 May 2009)

Log Message:
-----------
Tweaks to build systems.  Just some small cleanups...

Kent

Modified Paths:
--------------
    branches/blender2.5/blender/extern/CMakeLists.txt
    branches/blender2.5/blender/extern/Makefile
    branches/blender2.5/blender/extern/SConscript
    branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
    branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile

Modified: branches/blender2.5/blender/extern/CMakeLists.txt
===================================================================
--- branches/blender2.5/blender/extern/CMakeLists.txt	2009-05-07 22:31:19 UTC (rev 20101)
+++ branches/blender2.5/blender/extern/CMakeLists.txt	2009-05-08 03:49:48 UTC (rev 20102)
@@ -32,14 +32,6 @@
   SUBDIRS(bullet2)
 ENDIF(WITH_BULLET)
 
-IF(WITH_INTERNATIONAL)
-  SUBDIRS(bFTGL)
-ENDIF(WITH_INTERNATIONAL)
-
-IF(WITH_VERSE)
-  SUBDIRS(verse)
-ENDIF(WITH_VERSE)
-
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   SUBDIRS(binreloc)
 ENDIF(CMAKE_SYSTEM_NAME MATCHES "Linux")

Modified: branches/blender2.5/blender/extern/Makefile
===================================================================
--- branches/blender2.5/blender/extern/Makefile	2009-05-07 22:31:19 UTC (rev 20101)
+++ branches/blender2.5/blender/extern/Makefile	2009-05-08 03:49:48 UTC (rev 20102)
@@ -41,10 +41,6 @@
 endif
 endif
 
-ifeq ($(WITH_VERSE), true)
-   DIRS += verse
-endif
-
 ifneq ($(NAN_NO_KETSJI), true)
     DIRS += bullet2
 endif

Modified: branches/blender2.5/blender/extern/SConscript
===================================================================
--- branches/blender2.5/blender/extern/SConscript	2009-05-07 22:31:19 UTC (rev 20101)
+++ branches/blender2.5/blender/extern/SConscript	2009-05-08 03:49:48 UTC (rev 20102)
@@ -11,9 +11,6 @@
 if env['WITH_BF_BULLET']:
     SConscript(['bullet2/src/SConscript'])
 
-if env['WITH_BF_INTERNATIONAL']:
-    SConscript(['bFTGL/SConscript'])
-
 if env['WITH_BF_FFMPEG'] and env['BF_FFMPEG_LIB'] == '':
     SConscript(['x264/SConscript'])
     SConscript(['libmp3lame/SConscript'])

Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
===================================================================
--- branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp	2009-05-07 22:31:19 UTC (rev 20101)
+++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp	2009-05-08 03:49:48 UTC (rev 20102)
@@ -27,6 +27,7 @@
  */
 
 #include "KX_BlenderGL.h"
+#include "BLF_api.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>

Modified: branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile
===================================================================
--- branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile	2009-05-07 22:31:19 UTC (rev 20101)
+++ branches/blender2.5/blender/source/gameengine/BlenderRoutines/Makefile	2009-05-08 03:49:48 UTC (rev 20102)
@@ -54,7 +54,7 @@
 CPPFLAGS += -I../../blender/blenkernel
 CPPFLAGS += -I../../blender/render/extern/include
 CPPFLAGS += -I../../blender/blenloader
-CPPFLAGS += -I../../blender/blenkernel
+CPPFLAGS += -I../../blender/blenfont
 CPPFLAGS += -I../../blender/gpu
 CPPFLAGS += -I../Converter
 CPPFLAGS += -I../Expressions