Commit: 16a7dc70ee65eb6002686d481ba96546936bd3d0
Author: Sebastián Barschkis
Date: Thu Dec 24 00:58:34 2015 +0100
Branches: fluid-mantaflow
https://developer.blender.org/rB16a7dc70ee65eb6002686d481ba96546936bd3d0
readme updates
===================================================================
M readme.md
===================================================================
diff --git a/readme.md b/readme.md
index 21041b9..86df51f 100644
--- a/readme.md
+++ b/readme.md
@@ -1,3 +1,7 @@
+# Blender Mantaflow integration
+
+This is the current state of the Blender Mantaflow integration. It builds on
previous integration steps which can be found in the Blender branch
`soc-2014-fluid`.
+
## Build (for the impatient)
### Mac OSX
@@ -16,9 +20,10 @@
$ cd lib
$ svn checkout
https://svn.blender.org/svnroot/bf-blender/trunk/lib/darwin-9.x.universal
- 2. Play this github repo on top:
+ 2. Check out the soc-2014-fluid repo and play the new Mantaflow integration
(this github repo) on top:
$ cd ../blender
+ $ git checkout soc-2014-fluid
$ git remote add github https://github.com/sebbas/BlenderMantaflow.git
$ git pull github soc-2014-fluid
@@ -45,8 +50,9 @@ Run Blender from *your_path/build_darwin/bin/Blender.app*!
$ git submodule foreach git checkout master
$ git submodule foreach git pull --rebase origin master
- 2. Play this github repo on top:
+ 2. Check out the soc-2014-fluid repo and play the new Mantaflow integration
(this github repo) on top:
+ $ git checkout soc-2014-fluid
$ git remote add github https://github.com/sebbas/BlenderMantaflow.git
$ git pull github soc-2014-fluid
@@ -58,7 +64,7 @@ Run Blender from *your_path/build_darwin/bin/Blender.app*!
Since this repository relies on a working Blender building environment, the
easiest way to set it up is to play it on top of the official Blender code. You
can do so by following these steps:
- 1. If you haven't already, download the latest Blender
[code](http://wiki.blender.org/index.php/Dev:Doc/Building_Blender). If you
have, then make sure that it is *up-to-date*! Make sure to *only get* the code,
we will build later.
+ 1. If you haven't already, download the latest Blender
[code](http://wiki.blender.org/index.php/Dev:Doc/Building_Blender). If you
have, then make sure that it is *up-to-date*! Make sure to *only get* the code,
we will build it later.
2. Navigate to the Blender source code directory and check out the
*soc-2014-fluid* repository which contains the old Mantaflow integration:
@@ -73,11 +79,9 @@ Since this repository relies on a working Blender building
environment, the easi
3. Now build the code, preferably with CMake. You only need to make sure that
your compiler supports OpenMP as the internal Mantaflow version relies on that.
- 3.1 **Linux**:
-Under Linux you should normally not not have any problems with the compiler as
the default GNU compiler is readily available and supports OpenMP.
+ 3.1 **Linux**: Under Linux you should normally not not have any problems
with the compiler as the default GNU compiler is readily available and supports
OpenMP.
- 3.2 **Mac OSX**:
-For Mac OSX you need to specify a compiler different from the default Clang
compiler since that one unfortunately does not support OpenMP. Luckily, the
*lib* directory from the SVN which you downloaded along with the source code,
contains an OpenMP enabled compiler! Use it by telling CMake where to find it:
+ 3.2 **Mac OSX**: For Mac OSX you need to specify a compiler different from
the default Clang compiler since that one unfortunately does not support
OpenMP. Luckily, the *lib* directory from the SVN which you downloaded along
with the source code, contains an OpenMP enabled compiler! Use it by telling
CMake where to find it:
$ cmake ../blender/
-DCMAKE_C_COMPILER=your_path/blender-build/lib/darwin-9.x.universal/clang-omp-3.5/bin/clang
-DCMAKE_CXX_COMPILER=your_path/blender-build/lib/darwin-9.x.universal/clang-omp-3.5/bin/clang++
@@ -88,3 +92,17 @@ For Mac OSX you need to specify a compiler different from
the default Clang comp
Some fire renderings can be found on [Vimeo](https://vimeo.com/sebbas/videos).
For the current development state, take a look at the latest videos!
+
+## Troubleshooting
+
+### Mac OSX
+
+If you have problems building under Mac OS 10.11 "El Capitan" and with Xcode 7
(I did) then one possible workaround is to use an older Mac OSX SDK. I used the
SDK from 10.10.
+
+ 1. Get a copy of the Mac OSX 10.10 SDK. It can be found in Xcode 6 under
`Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk`.
You might find Xcode 6 itself on your Time Machine Backup or you can download
it from [Apple](https://developer.apple.com/downloads/).
+
+ 2. Copy `MacOSX10.10.sdk` into your current Xcode 7 app, alongside the 10.11
SDK which is located in
`/ApplicationsXcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/`.
+
+ 3. In the Blender source directory and in `CMakeLists.txt`, change all
instance of 10.11 to 10.10 (I just needed to make one change).
+
+ Hope this works for you, if you know a better fix then please let me know!
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
