enable multilingual support on linux and os x using the original Makefiles

7 files changed, 62 insertions, 2 deletions

diff --git a/source/Makefile b/source/Makefile
index 54dda35e617..97f149ae526 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -136,6 +136,28 @@ PYPLAYERLIB ?= $(PYLIB)
   ifeq ($(WITH_QUICKTIME), true)
     COMLIB += $(OCGDIR)/blender/blenderqt/$(DEBUG_DIR)libblenderqt.a
   endif
+ifeq ($(INTERNATIONAL), true)
+    COMLIB += $(OCGDIR)/blender/ftfont/$(DEBUG_DIR)libftfont.a
+    ifeq ($(OS), windows)
+        ifeq ($(FREE_WINDOWS), true)
+          COMLIB += $(NAN_GETTEXT)/lib/freegettext.a
+          COMLIB += $(NAN_FTGL)/lib/libftgl.a
+          COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
+          COMLIB += $(NAN_ICONV)/lib/freeiconv.a
+        else
+          COMLIB += $(NAN_GETTEXT)/lib/gnu_gettext.lib
+          COMLIB += $(NAN_FTGL)/lib/ftgl_static_ST.lib
+          COMLIB += $(NAN_FREETYPE)/lib/freetype211ST.lib
+          COMLIB += $(NAN_ICONV)/lib/iconv.lib
+        endif
+    else
+        COMLIB += $(NAN_FTGL)/lib/libftgl.a
+        COMLIB += $(NAN_FREETYPE)/lib/libfreetype.a
+    endif
+	ifeq ($(OS), darwin)
+	    COMLIB += $(NAN_GETTEXT)/lib/libintl.a
+	endif
+endif
 
     PULIB = $(NAN_IKSOLVER)/lib/libiksolver.a
     PULIB += $(NAN_MOTO)/lib/libmoto.a
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"
diff --git a/source/nan_definitions.mk b/source/nan_definitions.mk
index 4f6e82275d4..8c057de21f5 100644
--- a/source/nan_definitions.mk
+++ b/source/nan_definitions.mk
@@ -74,6 +74,7 @@ all debug::
     export NAN_GHOST ?= $(LCGDIR)/ghost
     export NAN_TEST_VERBOSITY ?= 1
     export NAN_BMFONT ?= $(LCGDIR)/bmfont
+    export NAN_FTGL ?= $(LCGDIR)/ftgl
 
 
   # Platform Dependent settings go below:
@@ -98,6 +99,8 @@ all debug::
     export NAN_MESA ?= /usr/src/Mesa-3.1
     export NAN_ZLIB ?= $(LCGDIR)/zlib
     export NAN_NSPR ?= $(LCGDIR)/nspr
+    export NAN_FREETYPE ?= $(LCGDIR)/freetype
+    export NAN_GETTEXT ?= $(LCGDIR)/gettext	
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -132,6 +135,8 @@ all debug::
     export NAN_MESA ?= /usr/src/Mesa-3.1
     export NAN_ZLIB ?= $(LCGDIR)/zlib
     export NAN_NSPR ?= $(LCGDIR)/nspr
+    export NAN_FREETYPE ?= /sw
+    export NAN_GETTEXT ?= /sw
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -148,6 +153,9 @@ all debug::
     # enable quicktime by default on OS X
     export WITH_QUICKTIME ?= true
 
+    # enable l10n
+    export INTERNATIONAL ?= true
+
   else
   ifeq ($(OS),freebsd)
 
@@ -168,6 +176,9 @@ all debug::
     export NAN_MESA ?= /usr/src/Mesa-3.1
     export NAN_ZLIB ?= /usr
     export NAN_NSPR ?= /usr/local
+    export NAN_FREETYPE ?= $(LCGDIR)/freetype
+    export NAN_GETTEXT ?= $(LCGDIR)/gettext
+
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -201,6 +212,8 @@ all debug::
     export NAN_MESA ?= /usr/src/Mesa-3.1
     export NAN_ZLIB ?= /usr/freeware
     export NAN_NSPR ?= /usr/local/apps/openblender/nspr/target/dist
+    export NAN_FREETYPE ?= $(LCGDIR)/freetype
+    export NAN_GETTEXT ?= $(LCGDIR)/gettext
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -234,6 +247,8 @@ all debug::
     export NAN_MESA ?= /usr
     export NAN_ZLIB ?= /usr
     export NAN_NSPR ?= $(LCGDIR)/nspr
+    export NAN_FREETYPE ?= /usr
+    export NAN_GETTEXT ?= /usr
 
     # Uncomment the following line to use Mozilla inplace of netscape
     export CPPFLAGS += -DMOZ_NOT_NET
@@ -247,6 +262,9 @@ all debug::
     # Be paranoid regarding library creation (do not update archives)
     export NAN_PARANOID ?= true
 
+    #i10n
+    export INTERNATIONAL ?= true
+
   else
   ifeq ($(OS),openbsd)
 
@@ -268,6 +286,8 @@ all debug::
     export NAN_MESA ?= /usr/src/Mesa-3.1
     export NAN_ZLIB ?= $(LCGDIR)/zlib
     export NAN_NSPR ?= $(LCGDIR)/nspr
+    export NAN_FREETYPE ?= $(LCGDIR)/freetype
+    export NAN_GETTEXT ?= $(LCGDIR)/gettext
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -301,6 +321,8 @@ all debug::
     export NAN_MESA ?= /usr/src/Mesa-3.1
     export NAN_ZLIB ?= /usr
     export NAN_NSPR ?= $(LCGDIR)/nspr
+    export NAN_FREETYPE ?= $(LCGDIR)/freetype
+    export NAN_GETTEXT ?= $(LCGDIR)/gettext
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -334,6 +356,8 @@ all debug::
     export NAN_MESA ?= /usr/src/Mesa-3.1
     export NAN_ZLIB ?= $(LCGDIR)/zlib
     export NAN_NSPR ?= $(LCGDIR)/nspr
+    export NAN_FREETYPE ?= $(LCGDIR)/freetype
+    export NAN_GETTEXT ?= $(LCGDIR)/gettext
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
@@ -365,6 +389,8 @@ all debug::
     export NAN_MESA ?= /usr/src/Mesa-3.1
     export NAN_ZLIB ?= $(LCGDIR)/zlib
     export NAN_NSPR ?= $(LCGDIR)/nspr
+    export NAN_FREETYPE ?= $(LCGDIR)/freetype
+    export NAN_GETTEXT ?= $(LCGDIR)/gettext
 
     # Uncomment the following line to use Mozilla inplace of netscape
     # CPPFLAGS +=-DMOZ_NOT_NET
diff --git a/source/nan_link.mk b/source/nan_link.mk
index d23de1de998..a730e9a8426 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -68,6 +68,9 @@ ifeq ($(OS),darwin)
     endif
     LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries
     DBG_LDFLAGS += -L/System/Library/Frameworks/OpenGL.framework/Libraries
+    ifeq ($(INTERNATIONAL), true)
+        LDFLAGS += -L$(NAN_GETTEXT)/lib -liconv
+    endif
 endif
 
 ifeq ($(OS),freebsd)