diff options
| -rw-r--r-- | extern/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | extern/Makefile | 4 | ||||
| -rw-r--r-- | extern/SConscript | 3 | ||||
| -rw-r--r-- | source/gameengine/BlenderRoutines/KX_BlenderGL.cpp | 1 | ||||
| -rw-r--r-- | source/gameengine/BlenderRoutines/Makefile | 2 |
5 files changed, 2 insertions, 16 deletions
diff --git a/extern/CMakeLists.txt b/extern/CMakeLists.txt index b81efb52de9..45778e235cd 100644 --- a/extern/CMakeLists.txt +++ b/extern/CMakeLists.txt @@ -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") diff --git a/extern/Makefile b/extern/Makefile index 256837d660f..582d158b66f 100644 --- a/extern/Makefile +++ b/extern/Makefile @@ -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 diff --git a/extern/SConscript b/extern/SConscript index 716aee8991f..126f40b00b3 100644 --- a/extern/SConscript +++ b/extern/SConscript @@ -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']) diff --git a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp index b08eaf6e026..de7a7f54fde 100644 --- a/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp +++ b/source/gameengine/BlenderRoutines/KX_BlenderGL.cpp @@ -27,6 +27,7 @@ */ #include "KX_BlenderGL.h" +#include "BLF_api.h" #ifdef HAVE_CONFIG_H #include <config.h> diff --git a/source/gameengine/BlenderRoutines/Makefile b/source/gameengine/BlenderRoutines/Makefile index 3a2c30672cc..f5486bae87b 100644 --- a/source/gameengine/BlenderRoutines/Makefile +++ b/source/gameengine/BlenderRoutines/Makefile @@ -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 |