Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'source/nan_link.mk')
-rw-r--r--source/nan_link.mk19
1 files changed, 10 insertions, 9 deletions
diff --git a/source/nan_link.mk b/source/nan_link.mk
index 668955e5fb6..8dda3b8c2df 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -87,7 +87,7 @@ ifeq ($(OS),linux)
LLIBS += -lc -lm -ldl -lutil
LOPTS = -export-dynamic
endif
- ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64"))
+ ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64 ia64 parisc64 powerpc sparc64"))
COMMENT = "MESA 3.1"
LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
LLIBS += -lutil -lc -lm -ldl -lpthread
@@ -97,13 +97,6 @@ ifeq ($(OS),linux)
SADD = $(NAN_MESA)/lib/libGL.a $(NAN_MESA)/lib/libGLU.a
DYNLDFLAGS = -shared $(LDFLAGS)
endif
- ifeq ($(CPU),$(findstring $(CPU), "powerpc sparc64"))
- LLIBS = -L/usr/X11R6/lib/ -lXmu -lXext -lX11 -lc -ldl -lm -lutil
- DADD = -lGL -lGLU
- SADD = /usr/lib/libGL.a /usr/lib/libGLU.a
- LOPTS = -export-dynamic
- DYNLDFLAGS = -shared $(LDFLAGS)
- endif
LLIBS += -lz
endif
@@ -116,8 +109,12 @@ endif
ifeq ($(OS),solaris)
ifeq (x86_64, $(findstring x86_64, $(CPU)))
LLIBS = -lrt
+ LLIBS += -L$(NAN_MESA)/lib/amd64
+ else
+ LLIBS += -L$(NAN_MESA)/lib
endif
- LLIBS += -L$(NAN_MESA)/lib -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl
+
+ LLIBS += -lGLU -lGL -lXmu -lXext -lXi -lX11 -lc -lm -ldl -lsocket -lnsl
DYNLDFLAGS = -shared $(LDFLAGS)
endif
@@ -166,4 +163,8 @@ ifeq ($(INTERNATIONAL),true)
LLIBS += $(NAN_GETTEXT_LIB)
endif
+ifeq ($(WITH_BF_OPENMP),true)
+ LLIBS += -lgomp
+endif
+
LLIBS += $(NAN_PYTHON_LIB)