Tweaks to build systems. Just some small cleanups...
authorKent Mein <mein@cs.umn.edu>
Fri, 8 May 2009 03:49:48 +0000 (03:49 +0000)
committerKent Mein <mein@cs.umn.edu>
Fri, 8 May 2009 03:49:48 +0000 (03:49 +0000)
Kent

extern/CMakeLists.txt
extern/Makefile
extern/SConscript
source/gameengine/BlenderRoutines/KX_BlenderGL.cpp
source/gameengine/BlenderRoutines/Makefile

index b81efb52de901d06ee2b68f92e96940e6f1c79f5..45778e235cd7f06522a3b2b812ad0ec6366d035d 100644 (file)
@@ -32,14 +32,6 @@ IF(WITH_BULLET)
   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")
index 256837d660f8c4311609c7cacf37669e3bfd2e91..582d158b66f94310b8a2301e88d46f0515ff45d4 100644 (file)
@@ -41,10 +41,6 @@ ifeq ($(NAN_FFMPEG), $(LCGDIR)/gcc/ffmpeg)
 endif
 endif
 
-ifeq ($(WITH_VERSE), true)
-   DIRS += verse
-endif
-
 ifneq ($(NAN_NO_KETSJI), true)
     DIRS += bullet2
 endif
index 716aee8991f336be67f343feaf0c53fa992e9412..126f40b00b36c1b501aeba1bee5aeafc46911db8 100644 (file)
@@ -11,9 +11,6 @@ if env['WITH_BF_GAMEENGINE']:
 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'])
index b08eaf6e026fdd773a8754cd55d1c7b7e2c71206..de7a7f54fdeef9bc09134e37a6c1ef8acdf08bf9 100644 (file)
@@ -27,6 +27,7 @@
  */
 
 #include "KX_BlenderGL.h"
+#include "BLF_api.h"
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
index 3a2c30672ccae2730e65a3ed86e24b44beb96880..f5486bae87b7057a3c234f90908e0a4fd1cced79 100644 (file)
@@ -54,7 +54,7 @@ CPPFLAGS += -I../../blender/blenlib
 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