From d1285dc756711b6dccb30a30df661376fe513bee Mon Sep 17 00:00:00 2001 From: Kent Mein Date: Thu, 9 Nov 2006 15:45:19 +0000 Subject: This is really two commits but the first one is very small and affects one file I modified for the other patch. So I'm being bad and combining them together. First one is added -lXi to LLIBS for solaris. (Makes it so it compiles again with the tablet stuff added) Second one is the real commit its an expansion of patch #4458 This adds optional ICONV lining to support international fonts in the file selector. Thanks to wisit venita (dripstone) I mostly just cleaned it up a little and made it optional via defines. Its currently turned off for all platforms except for solaris on scons. For scons see your config/(platform).py file look for WITH_BF_ICONV For the Makefiles look at source/nan_definitions.mk look for WITH_ICONV (basically you'll want to export WITH_ICONV=true and possibly set some other stuff) Let me know if there are any problems. Kent -- mein@cs.umn.edu --- config/darwin-config.py | 6 ++++++ config/linux2-config.py | 6 ++++++ config/linuxcross-config.py | 6 ++++++ config/openbsd3-config.py | 6 ++++++ config/sunos5-config.py | 6 ++++++ config/win32-mingw-config.py | 6 ++++++ config/win32-vc-config.py | 6 ++++++ 7 files changed, 42 insertions(+) (limited to 'config') diff --git a/config/darwin-config.py b/config/darwin-config.py index 0d4bc5c0be0..08fdbb41baa 100644 --- a/config/darwin-config.py +++ b/config/darwin-config.py @@ -109,6 +109,12 @@ BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' WITH_BF_QUICKTIME = 'true' # -DWITH_QUICKTIME +WITH_BF_ICONV = 'false' +BF_ICONV = LIBDIR + "/iconv" +BF_ICONV_INC = '${BF_ICONV}/include' +BF_ICONV_LIB = 'iconv' +BF_ICONV_LIBPATH = '${BF_ICONV}/lib' + # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'true' BF_OPENGL_LIB = 'GL GLU' diff --git a/config/linux2-config.py b/config/linux2-config.py index f7d84d228f3..c56a3d1d8f7 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -103,6 +103,12 @@ WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' +WITH_BF_ICONV = 'false' +BF_ICONV = LIBDIR + "/iconv" +BF_ICONV_INC = '${BF_ICONV}/include' +BF_ICONV_LIB = 'iconv' +BF_ICONV_LIBPATH = '${BF_ICONV}/lib' + # enable ffmpeg support WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG BF_FFMPEG = '/usr' diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py index 2d833d2fcfc..468f4cfcc50 100644 --- a/config/linuxcross-config.py +++ b/config/linuxcross-config.py @@ -98,6 +98,12 @@ WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' +WITH_BF_ICONV = 'false' +BF_ICONV = LIBDIR + "/iconv" +BF_ICONV_INC = '${BF_ICONV}/include' +BF_ICONV_LIB = 'iconv' +BF_ICONV_LIBPATH = '${BF_ICONV}/lib' + # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'false' BF_OPENGL = 'C:\\MingW' diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py index b44e79eb2a6..303f79c9bc8 100644 --- a/config/openbsd3-config.py +++ b/config/openbsd3-config.py @@ -103,6 +103,12 @@ BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib' WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME +WITH_BF_ICONV = 'false' +BF_ICONV = LIBDIR + "/iconv" +BF_ICONV_INC = '${BF_ICONV}/include' +BF_ICONV_LIB = 'iconv' +BF_ICONV_LIBPATH = '${BF_ICONV}/lib' + # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'true' BF_OPENGL = '/usr/X11R6' diff --git a/config/sunos5-config.py b/config/sunos5-config.py index de342c40158..71f1e7a1b48 100644 --- a/config/sunos5-config.py +++ b/config/sunos5-config.py @@ -107,6 +107,12 @@ WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' +WITH_BF_ICONV = 'true' +BF_ICONV = "/usr" +BF_ICONV_INC = '${BF_ICONV}/include' +BF_ICONV_LIB = 'iconv' +BF_ICONV_LIBPATH = '${BF_ICONV}/lib' + # enable ffmpeg support WITH_BF_FFMPEG = 'false' # -DWITH_FFMPEG BF_FFMPEG = '/usr/local' diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index e23e6436c59..f84bf45c585 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -120,6 +120,12 @@ WITH_BF_QUICKTIME = 'false' # -DWITH_QUICKTIME BF_QUICKTIME = '/usr/local' BF_QUICKTIME_INC = '${BF_QUICKTIME}/include' +WITH_BF_ICONV = 'false' +BF_ICONV = LIBDIR + "/iconv" +BF_ICONV_INC = '${BF_ICONV}/include' +BF_ICONV_LIB = 'iconv' +BF_ICONV_LIBPATH = '${BF_ICONV}/lib' + # Mesa Libs should go here if your using them as well.... WITH_BF_STATICOPENGL = 'false' BF_OPENGL = 'C:\\MingW' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index eb0a2ca2939..9b8c446d918 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -123,6 +123,12 @@ BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes' BF_QUICKTIME_LIB = 'qtmlClient' BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries' +WITH_BF_ICONV = 'false' +BF_ICONV = LIBDIR + "/iconv" +BF_ICONV_INC = '${BF_ICONV}/include' +BF_ICONV_LIB = 'iconv' +BF_ICONV_LIBPATH = '${BF_ICONV}/lib' + WITH_BF_STATICOPENGL = 'false' BF_OPENGL_INC = '${BF_OPENGL}/include' BF_OPENGL_LIBINC = '${BF_OPENGL}/lib' -- cgit v1.2.3