[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60455] trunk/lib/darwin-9.x.universal/ opencollada: OSX/Collada: remove outdated patch and update README

[jens verwiebe]

Revision: 60455
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60455
Author:   jensverwiebe
Date:     2013-09-30 21:14:00 +0000 (Mon, 30 Sep 2013)
Log Message:
-----------
OSX/Collada: remove outdated patch and update README

Modified Paths:
--------------
    trunk/lib/darwin-9.x.universal/opencollada/README.rtf

Removed Paths:
-------------
    trunk/lib/darwin-9.x.universal/opencollada/OSX_compilefix.patch

Deleted: trunk/lib/darwin-9.x.universal/opencollada/OSX_compilefix.patch
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/OSX_compilefix.patch	2013-09-30 21:11:20 UTC (rev 60454)
+++ trunk/lib/darwin-9.x.universal/opencollada/OSX_compilefix.patch	2013-09-30 21:14:00 UTC (rev 60455)
@@ -1,35 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index d27d35d..96ccb32 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -232,7 +232,7 @@ find_package(PCRE)
- if (PCRE_FOUND)
- 	message(STATUS "SUCCESSFUL: PCRE found")
- else ()  # if pcre not found building its local copy from ./Externals
--	if (WIN32)
-+	if (WIN32 OR APPLE)
- 		message("WARNING: Native PCRE not found, taking PCRE from ./Externals")
- 		add_definitions(-DPCRE_STATIC)
- 		add_subdirectory(${EXTERNAL_LIBRARIES}/pcre)
-diff --git a/common/libBuffer/include/CommonFWriteBufferFlusher.h b/common/libBuffer/include/CommonFWriteBufferFlusher.h
-index 6b2ce6c..39405fa 100644
---- a/common/libBuffer/include/CommonFWriteBufferFlusher.h
-+++ b/common/libBuffer/include/CommonFWriteBufferFlusher.h
-@@ -21,7 +21,7 @@
- #endif
- #else
- #if defined(__APPLE__) && defined(__MACH__)
--#	include <unordered_map>
-+#	include <tr1/unordered_map>
- #else
- #	include <tr1/unordered_map>
- #endif //if defined(__APPLE__) && defined(__MACH__)
-@@ -48,7 +48,7 @@ namespace Common
- 		typedef __int64 FilePosType;
- #endif
- #if defined(__APPLE__) && defined(__MACH__)
--        typedef std::unordered_map<MarkId, FilePosType > MarkIdToFilePos;
-+        typedef std::tr1::unordered_map<MarkId, FilePosType > MarkIdToFilePos;
- #else
- 		typedef std::tr1::unordered_map<MarkId, FilePosType > MarkIdToFilePos;
- #endif

Modified: trunk/lib/darwin-9.x.universal/opencollada/README.rtf
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/README.rtf	2013-09-30 21:11:20 UTC (rev 60454)
+++ trunk/lib/darwin-9.x.universal/opencollada/README.rtf	2013-09-30 21:14:00 UTC (rev 60455)
@@ -2,9 +2,13 @@
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;}
 \paperw11900\paperh16840\margl1440\margr1440\vieww18660\viewh9160\viewkind0
-\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
+\deftab720
+\pard\pardeftab720
 
-\f0\fs24 \cf0 I compiled this time using xcode/clang\
+\f0\fs24 \cf0 git rev 828b60384552b83e55d2af7055f07d2c40b4d3f4\
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
+\cf0 \
+I compiled this time using xcode/clang\
 \
 It is easier this way to set bw-compatibility flags + clang gives\
 better codequality/speed.\
@@ -19,11 +23,4 @@
 In Xcode set your target architecture(s)\
 Compile.\
 \
-Some notes:\
-\
-The cmake missed the option to use PCRENATIVE=0/1\
-\
-unodered_maps are not working from std, so i patched this\
-to use tr1 again.\
-\
 llvm-gcc does not work with this source anymore due untyped vars ( clang is fine )}
\ No newline at end of file