* Added a slot for scripts to appear in the Render menu. The script category for
[blender-staging.git] / source / nan_link.mk
index 9b21ebfe2db93e4d0c389ff7a590caeabc385014..e6824643a0431c5c8d538780d025736dd0682c59 100644 (file)
@@ -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