forked from bartvdbraak/blender
Tweaks to build systems. Just some small cleanups...
Kent
This commit is contained in:
parent
7325b8e2bf
commit
171969213f
8
extern/CMakeLists.txt
vendored
8
extern/CMakeLists.txt
vendored
@ -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")
|
||||
|
4
extern/Makefile
vendored
4
extern/Makefile
vendored
@ -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
|
||||
|
3
extern/SConscript
vendored
3
extern/SConscript
vendored
@ -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'])
|
||||
|
@ -27,6 +27,7 @@
|
||||
*/
|
||||
|
||||
#include "KX_BlenderGL.h"
|
||||
#include "BLF_api.h"
|
||||
|
||||
#ifdef HAVE_CONFIG_H
|
||||
#include <config.h>
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user