[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [51848] trunk/lib/darwin-9.x.universal/osl /osx_osl_compile.patch: OSX/OSL: update compile patch

jens verwiebe info at jensverwiebe.de
Sat Nov 3 21:46:18 CET 2012


Revision: 51848
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=51848
Author:   jensverwiebe
Date:     2012-11-03 20:46:16 +0000 (Sat, 03 Nov 2012)
Log Message:
-----------
OSX/OSL: update compile patch

Added Paths:
-----------
    trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch

Added: trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch	                        (rev 0)
+++ trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch	2012-11-03 20:46:16 UTC (rev 51848)
@@ -0,0 +1,72 @@
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3dcf2c7..bafefaf 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -12,6 +12,39 @@ set (OSO_FILE_VERSION_MINOR 0)
+ set (BUILDSTATIC OFF CACHE BOOL "Build static library instead of shared")
+ set (LINKSTATIC OFF CACHE BOOL "Link with static external libraries when possible")
+ 
++set(OPENIMAGEIOHOME "${CMAKE_SOURCE_DIR}/../../openimageio")
++set(ILMBASE_HOME "${CMAKE_SOURCE_DIR}/../../openexr")
++set(BOOST_ROOT "${CMAKE_SOURCE_DIR}/../../boost")
++set(OPENEXR_HOME "${CMAKE_SOURCE_DIR}/../../openexr")
++set(LLVM_DIRECTORY "${CMAKE_SOURCE_DIR}/../../llvm")
++set(LLVM_STATIC YES)
++set(TBB_INCLUDES "${CMAKE_SOURCE_DIR}/../../openimageio/include/OpenImageIO")
++set(CMAKE_INSTALL_PREFIX "${CMAKE_SOURCE_DIR}/../../osl" CACHE PATH "" FORCE)
++set(CMAKE_OSX_DEPLOYMENT_TARGET "10.5" CACHE STRING "" FORCE)
++set(CMAKE_OSX_ARCHITECTURES "x86_64; i386" CACHE STRING "" FORCE)
++set(CMAKE_BUILD_TYPE "Release" CACHE STRING "" FORCE)
++
++# extern libs that could not be linked to static oiio
++add_library(imp_oiio STATIC IMPORTED)
++set_property(TARGET imp_oiio PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openimageio/lib/libopenimageio.a)
++
++add_library(imp_tiff STATIC IMPORTED)
++set_property(TARGET imp_tiff PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../tiff/lib/libtiff.a)
++
++add_library(imp_png STATIC IMPORTED)
++set_property(TARGET imp_png PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../png/lib/libpng12.a)
++
++add_library(imp_jpeg STATIC IMPORTED)
++set_property(TARGET imp_jpeg PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../jpeg/lib/libjpeg.a)
++
++add_library(imp_imf STATIC IMPORTED)
++set_property(TARGET imp_imf PROPERTY IMPORTED_LOCATION ${CMAKE_SOURCE_DIR}/../../openexr/lib/libIlmImf.a )
++
++add_library(imp_z STATIC IMPORTED)
++set_property(TARGET imp_z PROPERTY IMPORTED_LOCATION /usr/lib/libz.1.dylib )
++
++set(OIIO_STATIC_EXTRALIBS imp_tiff imp_png imp_jpeg imp_imf imp_z)
++set(OPENIMAGEIO_LIBRARY imp_oiio ${OIIO_STATIC_EXTRALIBS})
+ 
+ cmake_minimum_required (VERSION 2.6)
+ if (NOT CMAKE_VERSION VERSION_LESS 2.8.4)
+diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
+index a5d0f1a..299fe56 100644
+--- a/src/cmake/externalpackages.cmake
++++ b/src/cmake/externalpackages.cmake
+@@ -262,7 +262,7 @@ execute_process (COMMAND ${LLVM_CONFIG} --includedir
+                  OUTPUT_VARIABLE LLVM_INCLUDES
+   	         OUTPUT_STRIP_TRAILING_WHITESPACE)
+ find_library ( LLVM_LIBRARY
+-               NAMES LLVM-${LLVM_VERSION}
++               NAMES libLLVMAnalysis.a #LLVM-${LLVM_VERSION}
+                PATHS ${LLVM_LIB_DIR})
+ message (STATUS "LLVM version  = ${LLVM_VERSION}")
+ message (STATUS "LLVM dir      = ${LLVM_DIRECTORY}")
+diff --git a/src/liboslcomp/symtab.h b/src/liboslcomp/symtab.h
+index ffebb8a..8bf2c46 100644
+--- a/src/liboslcomp/symtab.h
++++ b/src/liboslcomp/symtab.h
+@@ -32,6 +32,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ #include <vector>
+ #include <stack>
+ 
++#ifdef IF
++#undef IF
++#endif /* IF */
++
+ #include <boost/unordered_map.hpp>
+ 
+ #include "OpenImageIO/typedesc.h"




More information about the Bf-blender-cvs mailing list