diff options
| author | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-10-25 09:53:04 +0300 |
|---|---|---|
| committer | Arystanbek Dyussenov <arystan.d@gmail.com> | 2009-10-25 09:53:04 +0300 |
| commit | 03d3527ef709530264a2a8abe70a1c0a1466c3a3 (patch) | |
| tree | 8bfa302bc963ebf1310db04f48d8de40a90f538b /config/linux2-config.py | |
| parent | a11eb1ed7a30cea2c0862c11852b4fa56a210196 (diff) | |
| parent | 16c1a2944cd52be2b4f80669ebe145937b4b9275 (diff) | |
Merge from trunk -r 23000:23968.
Resolved the 'inconsistent newlines' merge error by updating my svn client.
The error was caused by a bug in svn client (http://subversion.tigris.org/issues/show_bug.cgi?id=3262) that was
fixed in 1.5.5.
Fixed conflicts in image.c, object_edit.c, wm_operators.c, source/creator/CMakeLists.txt and CMakeLists.txt.
Merge didn't remove some files that were moved/renamed in trunk, svn reported 'Skipped [filename]' on these files.
I removed them with:
svn --force remove release/io
svn --force remove release/ui
svn --force remove source/blender/editors/preview
svn --force remove source/blender/editors/physics/ed_fluidsim.c
svn --force remove source/blender/editors/physics/editparticle.c
svn --force remove source/blender/editors/physics/ed_pointcache.c
svn --force remove source/blender/editors/mesh/mesh_layers.c
Now, before merging into trunk, need to update collada code so it builds ok and fix the possibility to build without
collada.
Diffstat (limited to 'config/linux2-config.py')
| -rw-r--r-- | config/linux2-config.py | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/config/linux2-config.py b/config/linux2-config.py index e50b8f70a5f..536a3e0e327 100644 --- a/config/linux2-config.py +++ b/config/linux2-config.py @@ -203,8 +203,6 @@ BF_DEBUG_CCFLAGS = ['-g'] BF_BUILDDIR = '../build/linux2' BF_INSTALLDIR='../install/linux2' -BF_DOCDIR='../install/doc' - #Link against pthread PLATFORM_LINKFLAGS = ['-pthread'] |