[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52799] trunk/lib/darwin-9.x.universal/osl : OSX/OSL: latest updates

[jens verwiebe]

Revision: 52799
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52799
Author:   jensverwiebe
Date:     2012-12-06 17:54:52 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
OSX/OSL: latest updates

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/osl/bin/oslc
    trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a
    trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a
    trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a
    trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch

Modified: trunk/lib/darwin-9.x.universal/osl/bin/oslc
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslcomp.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslexec.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/osl/lib/liboslquery.a
===================================================================
(Binary files differ)

Modified: trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch
===================================================================
--- trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch	2012-12-06 17:09:53 UTC (rev 52798)
+++ trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch	2012-12-06 17:54:52 UTC (rev 52799)
@@ -1,5 +1,5 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 3dcf2c7..491de9d 100644
+index b5357e4..1276a0e 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -12,6 +12,39 @@ set (OSO_FILE_VERSION_MINOR 0)
@@ -42,18 +42,19 @@
  
  cmake_minimum_required (VERSION 2.6)
  if (NOT CMAKE_VERSION VERSION_LESS 2.8.4)
-@@ -60,6 +93,10 @@ endif ()
- ##   extending LLVM ones will cause linker errors (unless you
- ##   rebuild LLVM with rtti enabled)
- set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fno-rtti" )
+@@ -69,6 +102,11 @@ else ()
+ 	set ( CMAKE_CXX_FLAGS_RELWITHDEBINFO "/MT /Zi /O2 /Ob1 /D NDEBUG /GR-" )
+ endif()
+ 
 +## Force the deployment target to really work
 +set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -mmacosx-version-min=10.5" )
 +set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -mmacosx-version-min=10.5" )
 +add_definitions ("-mmacosx-version-min=10.5")
- 
++
  # For gcc < 4.3, Boost needs some extra help detecting that we've
  # disabled RTTI.
-@@ -92,7 +129,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCC)
+ if (CMAKE_COMPILER_IS_GNUCC AND GCC_VERSION VERSION_LESS 4.3)
+@@ -105,7 +143,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCC)
          set (VISIBILITY_MAP_COMMAND "-Wl,--version-script=${PROJECT_SOURCE_DIR}/liboslexec/liboslexec.map")
      endif ()
  endif ()
@@ -62,41 +63,13 @@
  set (USE_TBB ON CACHE BOOL "Use TBB if needed")
  if (WIN32)
      set (USE_BOOST_WAVE ON CACHE BOOL "Use Boost Wave as preprocessor")
-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/oslcomp.cpp b/src/liboslcomp/oslcomp.cpp
-index 129766b..c085a3b 100644
---- a/src/liboslcomp/oslcomp.cpp
-+++ b/src/liboslcomp/oslcomp.cpp
-@@ -244,8 +244,8 @@ preprocess (const std::string &filename,
-     // Default /usr/bin/cpp on pre-Lion Apple is very bare bones,
-     // doesn't seem to support all the preprocessor directives (like #
-     // and ##), but the explicit gcc 4.2 one does.
--    if (OIIO::Filesystem::exists ("/usr/bin/cpp-4.2"))
--        cppcommand = "/usr/bin/cpp-4.2";
-+    if (OIIO::Filesystem::exists ("/usr/bin/llvm-cpp-4.2"))
-+        cppcommand = "/usr/bin/llvm-cpp-4.2";
- #endif
- 
-     cppcommand += std::string (" -xc -nostdinc ");
 diff --git a/src/liboslcomp/symtab.h b/src/liboslcomp/symtab.h
-index ffebb8a..8bf2c46 100644
+index 83d71fd..4283fb3 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>
+@@ -39,6 +39,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ # endif /* IF */
+ #endif
  
 +#ifdef IF
 +#undef IF