* Patch #4909 by Joseph Eagar (joeedh)

  - this patch adds verse support for SCons, which can be enabled by
    giving WITH_BF_VERSE=1, ie. on command-line
  - this patch also adds a custom lib dir possibility. From the patch description:


 "To set a custom ../lib dir, put LCGDIR="path to lib dir, including the platform folder name!" in your user-config.py."

* Fixed win32-vc-config.py so that it links to the proper library. Reported by Brandano.

7 files changed, 26 insertions, 4 deletions

diff --git a/source/blender/SConscript b/source/blender/SConscript
index add7e27a16b..9ead445aab1 100644
--- a/source/blender/SConscript
+++ b/source/blender/SConscript
@@ -1,5 +1,6 @@
 #!/usr/bin/python
 Import ('env')
+import sys
 
 SConscript(['avi/SConscript',
             'blenkernel/SConscript',
diff --git a/source/blender/blenkernel/SConscript b/source/blender/blenkernel/SConscript
index 3221696d21a..e5c5d9bf097 100644
--- a/source/blender/blenkernel/SConscript
+++ b/source/blender/blenkernel/SConscript
@@ -14,9 +14,13 @@ incs += ' ' + env['BF_SDL_INC']
 
 defs = ''
 
-if env['WITH_BF_INTERNATIONAL'] == 1:
-    defs += 'WITH_FREETYPE2'
+if env['WITH_BF_VERSE']:
+	defs += ' WITH_VERSE'
+	incs += ' ' + env['BF_VERSE_INCLUDE']
 
+if env['WITH_BF_VERSE']:
+	defs += ' WITH_VERSE'
+	
 if env['WITH_BF_OPENEXR'] == 1:
     defs += ' WITH_OPENEXR'
 
diff --git a/source/blender/blenlib/SConscript b/source/blender/blenlib/SConscript
index a7dab45ad13..e11934d968e 100644
--- a/source/blender/blenlib/SConscript
+++ b/source/blender/blenlib/SConscript
@@ -13,6 +13,10 @@ defs = ''
 if env['WITH_BF_INTERNATIONAL'] == 1:
     defs = 'WITH_FREETYPE2'
 
+if env['WITH_BF_VERSE']:
+	defs += ' WITH_VERSE'
+	incs += ' ' + env['BF_VERSE_INCLUDE']
+
 if env['OURPLATFORM'] == 'linux2':
     cflags='-pthread'
 
diff --git a/source/blender/blenloader/SConscript b/source/blender/blenloader/SConscript
index a5096cefdcd..fb36b15e3e7 100644
--- a/source/blender/blenloader/SConscript
+++ b/source/blender/blenloader/SConscript
@@ -10,4 +10,9 @@ incs += ' ../render/extern/include'
 
 incs += ' ' + env['BF_ZLIB_INC']
 
-env.BlenderLib ( 'bf_blenloader', sources, Split(incs), [], libtype=['core','player'], priority = [70, 30] )
+defs = ''
+if env['WITH_BF_VERSE']:
+	defs += ' WITH_VERSE'
+	incs += ' ' + env['BF_VERSE_INCLUDE']
+
+env.BlenderLib ( 'bf_blenloader', sources, Split(incs), Split(defs), libtype=['core','player'], priority = [70, 30] )
diff --git a/source/blender/imbuf/SConscript b/source/blender/imbuf/SConscript
index 0d9b9fbe81b..7d3503dfe2d 100644
--- a/source/blender/imbuf/SConscript
+++ b/source/blender/imbuf/SConscript
@@ -13,6 +13,10 @@ incs += ' ' + env['BF_ZLIB_INC']
 
 defs = []
 
+if env['WITH_BF_VERSE']:
+	defs.append('WITH_VERSE')
+	incs += ' ' + env['BF_VERSE_INCLUDE']
+	
 if env['WITH_BF_OPENEXR'] == 1:
     defs.append('WITH_OPENEXR')
 
diff --git a/source/blender/src/SConscript b/source/blender/src/SConscript
index a70f9254d98..0663cb01c5d 100644
--- a/source/blender/src/SConscript
+++ b/source/blender/src/SConscript
@@ -36,6 +36,10 @@ if env['WITH_BF_FFMPEG'] == 1:
     defs.append('WITH_FFMPEG')
     incs += ' ' + env['BF_FFMPEG_INC']
 
+if env['WITH_BF_VERSE']:
+	defs.append('WITH_VERSE')
+	incs += ' ' + env['BF_VERSE_INCLUDE']
+
 # TODO buildinfo
 if env['BF_BUILDINFO'] == 1:
     defs.append('NAN_BUILDINFO')
diff --git a/source/blender/src/transform_generics.c b/source/blender/src/transform_generics.c
index 71ce2ff7f84..a9dcabecb4f 100755
--- a/source/blender/src/transform_generics.c
+++ b/source/blender/src/transform_generics.c
@@ -485,8 +485,8 @@ void initTrans (TransInfo *t)
 void postTrans (TransInfo *t) 
 {
 	G.moving = 0; // Set moving flag off (display as usual)
-#ifdef WITH_VERSE
 	struct TransData *td;
+#ifdef WITH_VERSE
 
 	for (td = t->data; td < t->data + t->total; td++) {
 		if(td->flag & TD_VERSE_VERT) {