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/win32-vc-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/win32-vc-config.py')
| -rw-r--r-- | config/win32-vc-config.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index 40f749a7c6c..73e6e39b7d1 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -13,6 +13,7 @@ BF_PYTHON_VERSION = '3.1' BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}' BF_PYTHON_BINARY = 'python' BF_PYTHON_LIB = 'python31' +BF_PYTHON_DLL = '${BF_PYTHON_LIB}' BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib' WITH_BF_OPENAL = True @@ -183,4 +184,3 @@ PLATFORM_LINKFLAGS = ['/SUBSYSTEM:CONSOLE','/MACHINE:IX86','/INCREMENTAL:NO','/N BF_BUILDDIR = '..\\build\\win32-vc' BF_INSTALLDIR='..\\install\\win32-vc' -BF_DOCDIR='..\\install\\doc' |