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:
authorJean-Luc Peurière <jlp@nerim.net>2008-03-22 04:39:11 +0300
committerJean-Luc Peurière <jlp@nerim.net>2008-03-22 04:39:11 +0300
commit126ab7974d304804971c32c2df534b726cd89835 (patch)
tree47b1cbaba2f07fc5d3783b17fa8d5b8ff17f19e2 /config/darwin-config.py
parent1930a925c870e746c4fdba161a8af2c097eace74 (diff)
parent32b5138e6459df5298ca50865dafab4d22a4aeed (diff)
NDOF support added to trunk from ndof branch.
The latter is now obsolete and will be soon removed. Some tiny build tweaks for darwin committed in preparation of bigger changes for proper SDK suport both on intel and ppc
Diffstat (limited to 'config/darwin-config.py')
-rw-r--r--config/darwin-config.py12
1 files changed, 6 insertions, 6 deletions
diff --git a/config/darwin-config.py b/config/darwin-config.py
index 5a2fc93c52d..5a9b343a0bd 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -3,10 +3,10 @@ LIBDIR = '${LCGDIR}'
# enable ffmpeg support
WITH_BF_FFMPEG = 'true' # -DWITH_FFMPEG
-BF_FFMPEG = LIBDIR +'/ffmpeg'
+BF_FFMPEG = "#extern/ffmpeg"
BF_FFMPEG_INC = '${BF_FFMPEG}/include'
-BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
-BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
+#BF_FFMPEG_LIBPATH='${BF_FFMPEG}/lib'
+#BF_FFMPEG_LIB = 'avformat.a avcodec.a avutil.a'
WITH_BF_VERSE = 'false'
BF_VERSE = "#extern/verse/dist"
@@ -15,7 +15,7 @@ BF_VERSE_INCLUDE = BF_VERSE
BF_VERSE_LIBS = "libverse"
# python.org libs install in /library
-BF_PYTHON_VERSION = '2.3'
+BF_PYTHON_VERSION = '2.5'
if BF_PYTHON_VERSION=='2.3':
BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
else:
@@ -131,11 +131,11 @@ BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
WITH_BF_QUICKTIME = 'true' # -DWITH_QUICKTIME
-WITH_BF_ICONV = 'false'
+WITH_BF_ICONV = 'true'
BF_ICONV = LIBDIR + "/iconv"
BF_ICONV_INC = '${BF_ICONV}/include'
BF_ICONV_LIB = 'iconv'
-BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
+#BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
# Mesa Libs should go here if your using them as well....
WITH_BF_STATICOPENGL = 'true'