svn merge -r 12294:12347 https://svn.blender.org/svnroot/bf-blender/trunk/blender
[blender.git] / source / nan_link.mk
index 35eb80b2cc7ed0dcb85ac71e10a4ebbbde34411b..e6824643a0431c5c8d538780d025736dd0682c59 100644 (file)
@@ -69,16 +69,10 @@ ifeq ($(OS),darwin)
 endif
 
 ifeq ($(OS),freebsd)
-    LLIBS = -L/usr/X11R6/lib -lX11 -lXmu -lm -lutil -lz -pthread -lc_r
+    LLIBS = -L/usr/X11R6/lib -lX11 -lXmu -lXi -lm -lutil -lz -pthread -lc_r
     DADD = -lGL -lGLU
     DYNLDFLAGS = -shared $(LDFLAGS)
     LOPTS = -Wl,--export-dynamic
-  ifeq ($(OS_VERSION),$(findstring $(OS_VERSION), "3.4 4.0"))
-    COMMENT = "MESA 3.0"
-    SADD = /usr/X11R6/lib/libGL.a /usr/X11R6/lib/libGLU.a
-    LLIBS += -lc
-  else
-  endif
 endif
 
 ifeq ($(OS),irix)
@@ -124,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
 
@@ -136,6 +130,9 @@ ifeq ($(OS),windows)
                LDFLAGS += -mwindows -mno-cygwin -mconsole
                DADD += -L/usr/lib/w32api -lnetapi32 -lopengl32 -lglu32 -lshfolder
                DADD += -L/usr/lib/w32api -lwinmm -lwsock32
+               ifeq ($(WITH_VERSE),true)
+                       DADD += -lws2_32
+               endif
     else
            DADD = kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
                DADD += advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
@@ -158,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