diff options
author | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-25 12:27:30 +0400 |
---|---|---|
committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-07-25 12:27:30 +0400 |
commit | 9a904a3857c262827ac9dea7e4ed684df2453fcf (patch) | |
tree | 2f48fec447adc6061b925884f7f8bfe25d2d5e33 /build_files/scons/config | |
parent | c3f09c06cb362b716a4fcb5b2de8f1e256bcce91 (diff) |
OSX: adaptions needed for renewed osl/oiio/llvm
Diffstat (limited to 'build_files/scons/config')
-rw-r--r-- | build_files/scons/config/darwin-config.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_files/scons/config/darwin-config.py b/build_files/scons/config/darwin-config.py index 6f49960d624..7bb4c266ee5 100644 --- a/build_files/scons/config/darwin-config.py +++ b/build_files/scons/config/darwin-config.py @@ -154,7 +154,7 @@ BF_COLLADA_INC = '${BF_COLLADA}' BF_COLLADA_LIB = 'bf_collada' BF_OPENCOLLADA = LIBDIR + '/opencollada' BF_OPENCOLLADA_INC = '${BF_OPENCOLLADA}/include' -BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser UTF xml2 buffer ftoa' +BF_OPENCOLLADA_LIB = 'OpenCOLLADASaxFrameworkLoader OpenCOLLADAFramework OpenCOLLADABaseUtils OpenCOLLADAStreamWriter MathMLSolver GeneratedSaxParser xml2 buffer ftoa' BF_OPENCOLLADA_LIBPATH = LIBDIR + '/opencollada' BF_PCRE = LIBDIR + '/opencollada' BF_PCRE_LIB = 'pcre' @@ -181,7 +181,7 @@ WITH_BF_LLVM = True BF_LLVM = LIBDIR + '/llvm' BF_LLVM_LIB = 'LLVMBitReader LLVMJIT LLVMipo LLVMVectorize LLVMBitWriter LLVMX86CodeGen LLVMX86Desc LLVMX86Info LLVMX86AsmPrinter ' + \ 'LLVMX86Utils LLVMSelectionDAG LLVMCodeGen LLVMScalarOpts LLVMInstCombine LLVMTransformUtils LLVMipa LLVMAnalysis LLVMExecutionEngine ' + \ - 'LLVMTarget LLVMMC LLVMCore LLVMSupport' + 'LLVMTarget LLVMMC LLVMCore LLVMSupport LLVMObject' BF_LLVM_LIBPATH = '${BF_LLVM}/lib' WITH_BF_OIIO = True |