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

[jens verwiebe]

Revision: 52800
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52800
Author:   jensverwiebe
Date:     2012-12-06 18:02:44 +0000 (Thu, 06 Dec 2012)
Log Message:
-----------
OSX/OSL: cleanup the compile.patch

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

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:54:52 UTC (rev 52799)
+++ trunk/lib/darwin-9.x.universal/osl/osx_osl_compile.patch	2012-12-06 18:02:44 UTC (rev 52800)
@@ -1,5 +1,5 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index b5357e4..1276a0e 100644
+index b5357e4..a5130ed 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
 @@ -12,6 +12,39 @@ set (OSO_FILE_VERSION_MINOR 0)
@@ -54,15 +54,15 @@
  # For gcc < 4.3, Boost needs some extra help detecting that we've
  # disabled RTTI.
  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 ()
+@@ -107,7 +145,7 @@ if (CMAKE_COMPILER_IS_CLANG OR CMAKE_COMPILER_IS_GNUCC)
  endif ()
--
-+add_definitions ("-mmacosx-version-min=10.5")
+ 
  set (USE_TBB ON CACHE BOOL "Use TBB if needed")
- if (WIN32)
+-if (WIN32)
++if (WIN32 OR APPLE)
      set (USE_BOOST_WAVE ON CACHE BOOL "Use Boost Wave as preprocessor")
+ else ()
+     set (USE_BOOST_WAVE OFF CACHE BOOL "Use Boost Wave as preprocessor")
 diff --git a/src/liboslcomp/symtab.h b/src/liboslcomp/symtab.h
 index 83d71fd..4283fb3 100644
 --- a/src/liboslcomp/symtab.h