[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59052] trunk/lib/darwin-9.x.universal/ opencollada: OSX/collada: now at git 828b60384552b83e55d2af7055f07d2c40b4d3f4, added notes and diff

[jens verwiebe]

Revision: 59052
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59052
Author:   jensverwiebe
Date:     2013-08-10 13:43:39 +0000 (Sat, 10 Aug 2013)
Log Message:
-----------
OSX/collada: now at git 828b60384552b83e55d2af7055f07d2c40b4d3f4, added notes and diff

Added Paths:
-----------
    trunk/lib/darwin-9.x.universal/opencollada/OSX_compilefix.patch
    trunk/lib/darwin-9.x.universal/opencollada/README.rtf

Added: trunk/lib/darwin-9.x.universal/opencollada/OSX_compilefix.patch
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/OSX_compilefix.patch	                        (rev 0)
+++ trunk/lib/darwin-9.x.universal/opencollada/OSX_compilefix.patch	2013-08-10 13:43:39 UTC (rev 59052)
@@ -0,0 +1,35 @@
+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

Added: trunk/lib/darwin-9.x.universal/opencollada/README.rtf
===================================================================
--- trunk/lib/darwin-9.x.universal/opencollada/README.rtf	                        (rev 0)
+++ trunk/lib/darwin-9.x.universal/opencollada/README.rtf	2013-08-10 13:43:39 UTC (rev 59052)
@@ -0,0 +1,28 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww10800\viewh8400\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\pardirnatural
+
+\f0\fs24 \cf0 I compiled this time using xcode/clang\
+\
+It is easier this way to set bw-compatibility flags + clang gives\
+better codequality/speed.\
+\
+Usage:\
+\
+Set configuration in cmake-gui to xcode/crosscompile.\
+Set desired target sdk \
+Configure\
+Generate\
+\
+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.\
+}
\ No newline at end of file