diff options
| author | Kent Mein <mein@cs.umn.edu> | 2006-11-09 18:45:19 +0300 |
|---|---|---|
| committer | Kent Mein <mein@cs.umn.edu> | 2006-11-09 18:45:19 +0300 |
| commit | d1285dc756711b6dccb30a30df661376fe513bee (patch) | |
| tree | 981c646e894b8b77e6001becb88435e41358d9a8 /source/nan_link.mk | |
| parent | 56a12a30c5fa3699b66a3f6e92781c373b5403a0 (diff) | |
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
Diffstat (limited to 'source/nan_link.mk')
| -rw-r--r-- | source/nan_link.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/source/nan_link.mk b/source/nan_link.mk index 9b21ebfe2db..e6824643a04 100644 --- a/source/nan_link.mk +++ b/source/nan_link.mk @@ -118,7 +118,7 @@ ifeq ($(OS),openbsd) endif ifeq ($(OS),solaris) - LLIBS = -lGLU -lGL -lXmu -lXext -lX11 -lc -lm -ldl -lsocket -lnsl + LLIBS = -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl DYNLDFLAGS = -shared $(LDFLAGS) endif @@ -155,6 +155,10 @@ ifneq ($(OS), irix) LLIBS += $(NAN_SDLLIBS) endif +ifeq ($(WITH_ICONV),true) + LLIBS += $(NAN_ICONV_LIBS) +endif + ifeq ($(WITH_FFMPEG),true) LLIBS += $(NAN_FFMPEGLIBS) endif |