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:
authorTon Roosendaal <ton@blender.org>2006-07-03 23:50:53 +0400
committerTon Roosendaal <ton@blender.org>2006-07-03 23:50:53 +0400
commit64ff9ae4a846deb780c186893267f11bc40465d5 (patch)
tree68f16ee688a988f09dd15fcaf8f5938e84475813 /source/Makefile
parentd55b5240b9eb26429a2cadea055c904b032b90d0 (diff)
Mac intel commit
- patch from Douglas with endian fixes - Makefile adds static libiconv.a from lib/ - this version will use OpenEXR libs from lib/ too, and is latest release with threading support - openAL is missing, added it as default to not include it
Diffstat (limited to 'source/Makefile')
-rw-r--r--source/Makefile3
1 files changed, 3 insertions, 0 deletions
diff --git a/source/Makefile b/source/Makefile
index ba11ea2893d..f0273954440 100644
--- a/source/Makefile
+++ b/source/Makefile
@@ -201,6 +201,9 @@ ifeq ($(INTERNATIONAL), true)
endif
ifeq ($(OS), darwin)
COMLIB += $(NAN_GETTEXT)/lib/libintl.a
+ ifeq ($(CPU), i386)
+ COMLIB += $(NAN_GETTEXT)/lib/libiconv.a
+ endif
endif
ifeq ($(OS), solaris)
COMLIB += $(NAN_GETTEXT)/lib/libintl.a