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
path: root/source
diff options
context:
space:
mode:
authorStefan Gartner <stefang@aon.at>2004-11-03 17:45:52 +0300
committerStefan Gartner <stefang@aon.at>2004-11-03 17:45:52 +0300
commit772b66d79f862619ed1d0be37d364ef0553b7114 (patch)
tree7e3c8d8312fa106737cca37e9aa1a4d79c495d66 /source
parent691302f28dcf515cc99b1d7ad0c9e41970ab1fdd (diff)
build on Linux/x86_64
Diffstat (limited to 'source')
-rw-r--r--source/Makefile2
-rw-r--r--source/nan_link.mk2
2 files changed, 2 insertions, 2 deletions
diff --git a/source/Makefile b/source/Makefile
index 80dda10d982..9e344f38ad6 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -367,7 +367,7 @@ ifeq ($(NAN_NO_OPENAL), true)
NAN_SND_LIBS += $(SOUNDSYSTEM)
else
ifeq ($(OS),$(findstring $(OS), "freebsd linux windows"))
- ifeq ($(CPU),$(findstring $(CPU), "i386 powerpc"))
+ ifeq ($(CPU),$(findstring $(CPU), "i386 powerpc x86_64"))
ifeq ($(OS),freebsd)
NAN_SND_LIBS = $(SOUNDSYSTEM)
NAN_SND_LIBS += $(DUMMYSOUND)
diff --git a/source/nan_link.mk b/source/nan_link.mk
index 8316111c89e..f4fb8951a16 100644
--- a/source/nan_link.mk
+++ b/source/nan_link.mk
@@ -93,7 +93,7 @@ ifeq ($(OS),linux)
LLIBS += -lc -lm -ldl -lutil
LOPTS = -export-dynamic
endif
- ifeq ($(CPU),i386)
+ ifeq ($(CPU),$(findstring $(CPU), "i386 x86_64"))
COMMENT = "MESA 3.1"
LLIBS = -L$(NAN_MESA)/lib -L/usr/X11R6/lib -lXmu -lXext -lX11 -lXi
LLIBS += -lutil -lc -lm -ldl -lpthread