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:
authorCampbell Barton <ideasman42@gmail.com>2008-01-04 14:55:37 +0300
committerCampbell Barton <ideasman42@gmail.com>2008-01-04 14:55:37 +0300
commit9ac2817fef9f77be3ccb50441e3cd87379680c61 (patch)
tree439ad6052b0f9a8657b5e7b13ab6344623d34497 /source/nan_link.mk
parent5e58f5d4635dd4d4b38434643df5ede17f0e103f (diff)
some changes needed to get blender compiling with 64bit libs, use the systems Mesa now.
Diffstat (limited to 'source/nan_link.mk')
-rw-r--r--source/nan_link.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/nan_link.mk b/source/nan_link.mk
index 00d233962a9..e0745e9c1d4 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -119,8 +119,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