From 7180ad4c866e9190c5301c146b50980e1c42153e Mon Sep 17 00:00:00 2001 From: Stefan Gartner Date: Mon, 5 May 2003 21:28:54 +0000 Subject: enable multilingual support on linux and os x using the original Makefiles --- source/blender/Makefile | 4 ++++ source/blender/ftfont/intern/Makefile | 4 ++-- source/blender/src/Makefile | 4 ++++ source/blender/src/usiblender.c | 1 + 4 files changed, 11 insertions(+), 2 deletions(-) (limited to 'source/blender') diff --git a/source/blender/Makefile b/source/blender/Makefile index eb139d8d617..e62d4a95f9e 100644 --- a/source/blender/Makefile +++ b/source/blender/Makefile @@ -39,6 +39,10 @@ DIRS += writestreamglue readstreamglue writeblenfile readblenfile DIRS += avi imbuf img render radiosity blenlib blenkernel blenpluginapi DIRS += bpython makesdna src renderconverter +ifeq ($(INTERNATIONAL), true) + DIRS += ftfont +endif + ifeq ($(WITH_QUICKTIME), true) DIRS += quicktime endif diff --git a/source/blender/ftfont/intern/Makefile b/source/blender/ftfont/intern/Makefile index 16e0b76c5e7..f91176c46c3 100644 --- a/source/blender/ftfont/intern/Makefile +++ b/source/blender/ftfont/intern/Makefile @@ -45,10 +45,10 @@ CFLAGS += $(LEVEL_1_C_WARNINGS) #CPPFLAGS += -I$(NAN_GUARDEDALLOC)/include #CPPFLAGS += -I../../makesdna CPPFLAGS += -I$(NAN_FTGL)/include +CPPFLAGS += -I$(NAN_GETTEXT)/include +CPPFLAGS += -I$(NAN_FREETYPE)/include ifeq ($(OS), windows) CPPFLAGS += -I$(NAN_ICONV)/include - CPPFLAGS += -I$(NAN_GETTEXT)/include - CPPFLAGS += -I$(NAN_FREETYPE)/include ifeq ($(FREE_WINDOWS), true) CPPFLAGS += -I$(NAN_FREETYPE)/include/freetype2 CPPFLAGS += -DUSE_GETTEXT_DLL diff --git a/source/blender/src/Makefile b/source/blender/src/Makefile index a20c6e4db3d..64a2c95ea24 100644 --- a/source/blender/src/Makefile +++ b/source/blender/src/Makefile @@ -75,6 +75,7 @@ CPPFLAGS += -I../verify CPPFLAGS += -I.. CPPFLAGS += -I../../kernel/gen_system CPPFLAGS += -I../../gameengine/SoundSystem +CPPFLAGS += -I../ftfont # Only used by py_demo.c !!! CPPFLAGS += -I../radiosity/extern/include @@ -110,3 +111,6 @@ ifeq ($(WITH_QUICKTIME),true) CPPFLAGS += -DWITH_QUICKTIME endif +ifeq ($(INTERNATIONAL), true) + CPPFLAGS += -DINTERNATIONAL +endif diff --git a/source/blender/src/usiblender.c b/source/blender/src/usiblender.c index 53b50d20029..8f8d635905c 100644 --- a/source/blender/src/usiblender.c +++ b/source/blender/src/usiblender.c @@ -78,6 +78,7 @@ #include "BKE_main.h" #include "BKE_mball.h" #include "BKE_packedFile.h" +#include "BKE_utildefines.h" #include "BIF_fsmenu.h" #include "BIF_gl.h" -- cgit v1.2.3