diff options
Diffstat (limited to 'source/blender/editors/interface')
| -rw-r--r-- | source/blender/editors/interface/Makefile | 6 | ||||
| -rw-r--r-- | source/blender/editors/interface/SConscript | 10 |
2 files changed, 15 insertions, 1 deletions
diff --git a/source/blender/editors/interface/Makefile b/source/blender/editors/interface/Makefile index 39bb651a616..fe223fabf2a 100644 --- a/source/blender/editors/interface/Makefile +++ b/source/blender/editors/interface/Makefile @@ -35,6 +35,7 @@ include nan_compile.mk CFLAGS += $(LEVEL_1_C_WARNINGS) +CPPFLAGS += -I$(NAN_GLEW)/include CPPFLAGS += -I$(OPENGL_HEADERS) CPPFLAGS += -I$(NAN_BMFONT)/include @@ -52,3 +53,8 @@ CPPFLAGS += -I../../ftfont # own include CPPFLAGS += -I../include + +ifeq ($(INTERNATIONAL), true) + CPPFLAGS += -DINTERNATIONAL +endif + diff --git a/source/blender/editors/interface/SConscript b/source/blender/editors/interface/SConscript index 0586d07d945..42e4db60edb 100644 --- a/source/blender/editors/interface/SConscript +++ b/source/blender/editors/interface/SConscript @@ -5,5 +5,13 @@ sources = env.Glob('*.c') incs = '../include ../../blenlib ../../blenkernel ../../makesdna ../../imbuf' incs += ' ../../makesrna ../../windowmanager #/intern/guardedalloc #intern/bmfont' +incs += ' #/extern/glew/include' -env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), [], libtype=['core','intern'], priority=[40, 45] ) +defs = [] + +if env['WITH_BF_INTERNATIONAL']: + incs += ' ../../ftfont' + defs.append('INTERNATIONAL') + defs.append('FTGL_STATIC_LIBRARY') + +env.BlenderLib ( 'bf_editors_interface', sources, Split(incs), Split(defs), libtype=['core','intern'], priority=[40, 45] ) |