* 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.

19 files changed, 242 insertions, 203 deletions

diff --git a/SConstruct b/SConstruct
index bc1dd8e47aa..df318a526fa 100644
--- a/SConstruct
+++ b/SConstruct
@@ -205,9 +205,9 @@ if env['OURPLATFORM'] == 'linux2' :
         os.rmdir(root)
 
 if len(B.quickdebug) > 0 and printdebug != 0:
-	print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC
-	for l in B.quickdebug:
-		print "\t" + l
+    print B.bc.OKGREEN + "Buildings these libs with debug symbols:" + B.bc.ENDC
+    for l in B.quickdebug:
+        print "\t" + l
 
 # check target for blenderplayer. Set WITH_BF_PLAYER if found on cmdline
 if 'blenderplayer' in B.targets:
@@ -355,18 +355,18 @@ textinstall = env.Install(dir=env['BF_INSTALLDIR'], source=textlist)
 allinstall = [blenderinstall, dotblenderinstall, scriptinstall, plugininstall, textinstall]
 
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw'):
-    dllsources = ['#../lib/windows/gettext/lib/gnu_gettext.dll',
-                        '#../lib/windows/png/lib/libpng.dll',
-                        '#../lib/windows/python/lib/python24.dll',
+    dllsources = ['${LCGDIR}/gettext/lib/gnu_gettext.dll',
+                        '${LCGDIR}/png/lib/libpng.dll',
+                        '${LCGDIR}/python/lib/python24.dll',
                         '#release/windows/extra/python24.zip',
                         '#release/windows/extra/zlib.pyd',
-                        '#../lib/windows/sdl/lib/SDL.dll',
-                        '#../lib/windows/zlib/lib/zlib.dll',
-                        '#../lib/windows/tiff/lib/libtiff.dll']
+                        '${LCGDIR}/sdl/lib/SDL.dll',
+                        '${LCGDIR}/zlib/lib/zlib.dll',
+                        '${LCGDIR}/tiff/lib/libtiff.dll']
     if env['OURPLATFORM'] == 'win32-mingw':
-        dllsources += ['#../lib/windows/pthreads/lib/pthreadGC2.dll']
+        dllsources += ['${LCGDIR}/pthreads/lib/pthreadGC2.dll']
     else:
-        dllsources += ['#../lib/windows/pthreads/lib/pthreadVC2.dll']
+        dllsources += ['${LCGDIR}/pthreads/lib/pthreadVC2.dll']
     windlls = env.Install(dir=env['BF_INSTALLDIR'], source = dllsources)
     allinstall += windlls
 
diff --git a/config/darwin-config.py b/config/darwin-config.py
index 36f2949af53..d0f89376270 100644
--- a/config/darwin-config.py
+++ b/config/darwin-config.py
@@ -1,4 +1,11 @@
 LCGDIR = '#../lib/darwin-6.1-powerpc'
+LIBDIR = '${LCGDIR}'
+
+BF_VERSE = "#extern/verse/dist"
+BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
+BF_VERSE_INCLUDE = BF_VERSE
+BF_VERSE_LIBS = "libverse"
+
 BF_PYTHON = '/System/Library/Frameworks/Python.framework/Versions/'
 BF_PYTHON_VERSION = '2.3'
 BF_PYTHON_INC = '${BF_PYTHON}${BF_PYTHON_VERSION}/include/python${BF_PYTHON_VERSION}'
@@ -8,19 +15,19 @@ BF_PYTHON_LIBPATH = '${BF_PYTHON}${BF_PYTHON_VERSION}/lib/python${BF_PYTHON_VERS
 BF_PYTHON_LINKFLAGS = '-u __dummy -u _PyMac_Error -framework System -framework Python'
 
 WITH_BF_OPENAL = 'true'
-BF_OPENAL = LCGDIR + '/openal'
+BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'openal'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_SDL = 'true'
-BF_SDL = LCGDIR + '/sdl' #$(shell sdl-config --prefix)
+BF_SDL = LIBDIR + '/sdl' #$(shell sdl-config --prefix)
 BF_SDL_INC = '${BF_SDL}/include' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
 WITH_BF_FMOD = 'false'
-BF_FMOD = LCGDIR + '/fmod'
+BF_FMOD = LIBDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '/usr/local'
@@ -29,18 +36,18 @@ BF_OPENEXR_LIB = ' Iex Half IlmImf Imath '
 
 
 WITH_BF_JPEG = 'true'
-BF_JPEG = LCGDIR + '/jpeg'
+BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
 BF_JPEG_LIB = 'jpeg'
 BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
 WITH_BF_PNG = 'true'
-BF_PNG = LCGDIR + '/png'
+BF_PNG = LIBDIR + '/png'
 BF_PNG_INC = '${BF_PNG}/include'
 BF_PNG_LIB = 'png'
 BF_PNG_LIBPATH = '${BF_PNG}/lib'
 
-BF_TIFF = LCGDIR + '/tiff'
+BF_TIFF = LIBDIR + '/tiff'
 BF_TIFF_INC = '${BF_TIFF}/include'
 
 WITH_BF_ZLIB = 'true'
@@ -50,7 +57,7 @@ BF_ZLIB_LIB = 'z'
 
 WITH_BF_INTERNATIONAL = 'true'
 
-BF_GETTEXT = LCGDIR + '/gettext'
+BF_GETTEXT = LIBDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'intl'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
@@ -64,7 +71,7 @@ WITH_BF_GAMEENGINE='true'
 WITH_BF_PLAYER='true'
 
 WITH_BF_ODE = 'false'
-BF_ODE = LCGDIR + '/ode'
+BF_ODE = LIBDIR + '/ode'
 BF_ODE_INC = '${BF_ODE}/include'
 BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
 
@@ -78,14 +85,14 @@ BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 #WITH_BF_NSPR = 'true'
-#BF_NSPR = $(LCGDIR)/nspr
+#BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
 #BF_NSPR_LIB = 
 
 # Uncomment the following line to use Mozilla inplace of netscape
 #CPPFLAGS += -DMOZ_NOT_NET
 # Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LCGDIR)/mozilla
+#BF_MOZILLA = $(LIBDIR)/mozilla
 #BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
 #BF_MOZILLA_LIB =
 # Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
@@ -95,7 +102,7 @@ BF_SOLID_LIB = 'extern_solid'
 #BF_PARANOID = 'true'
 
 # enable freetype2 support for text objects
-BF_FREETYPE = LCGDIR + '/freetype'
+BF_FREETYPE = LIBDIR + '/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
diff --git a/config/linux2-config.py b/config/linux2-config.py
index 91568dc4588..4c8886982bc 100644
--- a/config/linux2-config.py
+++ b/config/linux2-config.py
@@ -1,4 +1,11 @@
 LCGDIR = '../lib/linux2'
+LIBDIR = "${LCGDIR}"
+
+BF_VERSE = "#extern/verse/dist"
+BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
+BF_VERSE_INCLUDE = BF_VERSE
+BF_VERSE_LIBS = "libverse"
+
 BF_PYTHON = '/usr'
 BF_PYTHON_VERSION = '2.4'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
@@ -17,7 +24,7 @@ BF_SDL_INC = '${BF_SDL}/include/SDL' #$(shell $(BF_SDL)/bin/sdl-config --cflags)
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 
 WITH_BF_FMOD = 'false'
-BF_FMOD = LCGDIR + '/fmod'
+BF_FMOD = LIBDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '/usr'
@@ -57,7 +64,7 @@ BF_FTGL_LIB = 'extern_ftgl'
 WITH_BF_GAMEENGINE='true'
 
 WITH_BF_ODE = 'false'
-BF_ODE = LCGDIR + '/ode'
+BF_ODE = LIBDIR + '/ode'
 BF_ODE_INC = BF_ODE + '/include'
 BF_ODE_LIB = BF_ODE + '/lib/libode.a'
 
@@ -71,14 +78,14 @@ BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 #WITH_BF_NSPR = 'true'
-#BF_NSPR = $(LCGDIR)/nspr
+#BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
 #BF_NSPR_LIB = 
 
 # Uncomment the following line to use Mozilla inplace of netscape
 #CPPFLAGS += -DMOZ_NOT_NET
 # Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LCGDIR)/mozilla
+#BF_MOZILLA = $(LIBDIR)/mozilla
 #BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
 #BF_MOZILLA_LIB =
 # Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
diff --git a/config/linuxcross-config.py b/config/linuxcross-config.py
index 247d4630926..67cdd3e51f1 100644
--- a/config/linuxcross-config.py
+++ b/config/linuxcross-config.py
@@ -1,5 +1,12 @@
-LCGDIR = '#../lib/windows'
-BF_PYTHON = LCGDIR + '/python'
+LCGDIR = '../lib/windows'
+LIBDIR = '${LCGDIR}'
+
+BF_VERSE = "#extern/verse/dist"
+BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
+BF_VERSE_INCLUDE = BF_VERSE
+BF_VERSE_LIBS = "libverse"
+
+BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.4'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
@@ -7,68 +14,68 @@ BF_PYTHON_LIB = 'python24'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = 'true'
-BF_OPENAL = LCGDIR + '/openal'
+BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'openal_static'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_SDL = 'true'
-BF_SDL = LCGDIR + '/sdl'
+BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
 BF_SDL_LIB = 'SDL'
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-BF_PTHREADS = LCGDIR + '/pthreads'
+BF_PTHREADS = LIBDIR + '/pthreads'
 BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadGC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
 WITH_BF_FMOD = 'false'
-BF_FMOD = LCGDIR + '/fmod'
+BF_FMOD = LIBDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
-BF_OPENEXR = LCGDIR + '/gcc/openexr'
+BF_OPENEXR = LIBDIR + '/gcc/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = ' Half IlmImf Iex '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
 WITH_BF_JPEG = 'true'
-BF_JPEG = LCGDIR + '/jpeg'
+BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
 BF_JPEG_LIB = 'jpeg'
 BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
 WITH_BF_PNG = 'true'
-BF_PNG = LCGDIR + '/png'
+BF_PNG = LIBDIR + '/png'
 BF_PNG_INC = '${BF_PNG}/include'
 BF_PNG_LIB = 'png'
 BF_PNG_LIBPATH = '${BF_PNG}/lib'
 
-BF_TIFF = LCGDIR + '/tiff'
+BF_TIFF = LIBDIR + '/tiff'
 BF_TIFF_INC = '${BF_TIFF}/include'
 
 WITH_BF_ZLIB = 'true'
-BF_ZLIB = LCGDIR + '/zlib'
+BF_ZLIB = LIBDIR + '/zlib'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
 #BF_ZLIB_LIB = 'z'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = 'true'
 
-BF_GETTEXT = LCGDIR + '/gettext'
+BF_GETTEXT = LIBDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gnu_gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_FTGL = 'true'
-BF_FTGL = LCGDIR + '/ftgl'
+BF_FTGL = LIBDIR + '/ftgl'
 BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE = 'false'
 
 WITH_BF_ODE = 'true'
-BF_ODE = LCGDIR + '/ode'
+BF_ODE = LIBDIR + '/ode'
 BF_ODE_INC = BF_ODE + '/include'
 BF_ODE_LIB = BF_ODE + '/lib/libode.a'
 
@@ -82,7 +89,7 @@ BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 # enable freetype2 support for text objects
-BF_FREETYPE = LCGDIR + '/gcc/freetype'
+BF_FREETYPE = LIBDIR + '/gcc/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
diff --git a/config/openbsd3-config.py b/config/openbsd3-config.py
index 2d1d92da2f2..abeb9186bb8 100644
--- a/config/openbsd3-config.py
+++ b/config/openbsd3-config.py
@@ -1,4 +1,6 @@
 LCGDIR = '../lib/openbsd3'
+LIBDIR = '${LCGDIR}'
+
 BF_PYTHON = '/usr/local'
 BF_PYTHON_VERSION = '2.3'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
@@ -7,7 +9,7 @@ BF_PYTHON_LIB = 'python${BF_PYTHON_VERSION}'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib/python${BF_PYTHON_VERSION}/config'
 
 WITH_BF_OPENAL = 'false'
-#BF_OPENAL = LCGDIR + '/openal'
+#BF_OPENAL = LIBDIR + '/openal'
 #BF_OPENAL_INC = '${BF_OPENAL}/include'
 #BF_OPENAL_LIB = 'openal'
 #BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
@@ -19,7 +21,7 @@ BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
 WITH_BF_FMOD = 'false'
-BF_FMOD = LCGDIR + '/fmod'
+BF_FMOD = LIBDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'false'
 BF_OPENEXR = '/usr/local'
@@ -61,7 +63,7 @@ BF_FTGL_LIB = 'extern_ftgl'
 WITH_BF_GAMEENGINE='true'
 
 WITH_BF_ODE = 'false'
-BF_ODE = LCGDIR + '/ode'
+BF_ODE = LIBDIR + '/ode'
 BF_ODE_INC = '${BF_ODE}/include'
 BF_ODE_LIB = '${BF_ODE}/lib/libode.a'
 
@@ -75,14 +77,14 @@ BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 #WITH_BF_NSPR = 'true'
-#BF_NSPR = $(LCGDIR)/nspr
+#BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
 #BF_NSPR_LIB = 
 
 # Uncomment the following line to use Mozilla inplace of netscape
 #CPPFLAGS += -DMOZ_NOT_NET
 # Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LCGDIR)/mozilla
+#BF_MOZILLA = $(LIBDIR)/mozilla
 #BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
 #BF_MOZILLA_LIB =
 # Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
diff --git a/config/sunos5-config.py b/config/sunos5-config.py
index cf84a68e490..436217c1be1 100644
--- a/config/sunos5-config.py
+++ b/config/sunos5-config.py
@@ -1,4 +1,6 @@
 LCGDIR = '../lib/sunos5'
+LIBDIR = '${LCGDIR}'
+
 BF_PYTHON = '/usr/local'
 BF_PYTHON_VERSION = '2.4'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
@@ -19,7 +21,7 @@ BF_SDL_LIBPATH = '${BF_SDL}/lib'
 BF_SDL_LIB = 'SDL' #BF_SDL #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer
 
 WITH_BF_FMOD = 'false'
-BF_FMOD = LCGDIR + '/fmod'
+BF_FMOD = LIBDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
 BF_OPENEXR = '/usr/local'
@@ -63,7 +65,7 @@ BF_FTGL_LIB = 'extern_ftgl'
 WITH_BF_GAMEENGINE='true'
 
 WITH_BF_ODE = 'false'
-BF_ODE = LCGDIR + '/ode'
+BF_ODE = LIBDIR + '/ode'
 BF_ODE_INC = BF_ODE + '/include'
 BF_ODE_LIB = BF_ODE + '/lib/libode.a'
 
@@ -77,14 +79,14 @@ BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 #WITH_BF_NSPR = 'true'
-#BF_NSPR = $(LCGDIR)/nspr
+#BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
 #BF_NSPR_LIB = 
 
 # Uncomment the following line to use Mozilla inplace of netscape
 #CPPFLAGS += -DMOZ_NOT_NET
 # Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LCGDIR)/mozilla
+#BF_MOZILLA = $(LIBDIR)/mozilla
 #BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
 #BF_MOZILLA_LIB =
 # Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py
index 6a4aed6503f..78c48ef95e1 100644
--- a/config/win32-mingw-config.py
+++ b/config/win32-mingw-config.py
@@ -1,5 +1,12 @@
 LCGDIR = '#../lib/windows'
-BF_PYTHON = LCGDIR + '/python'
+LIBDIR = "${LCGDIR}"
+
+BF_VERSE = "#extern/verse/dist"
+BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
+BF_VERSE_INCLUDE = BF_VERSE
+BF_VERSE_LIBS = "libverse"
+
+BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.4'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
@@ -7,74 +14,73 @@ BF_PYTHON_LIB = 'python24'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = 'true'
-BF_OPENAL = LCGDIR + '/openal'
+BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include'
 BF_OPENAL_LIB = 'openal_static'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_FFMPEG = 'false'
-BF_FFMPEG = LCGDIR + '/gcc/ffmpeg'
 BF_FFMPEG_LIB = 'avformat avutil avcodec'
-BF_FFMPEG_LIBPATH =  '${BF_FFMPEG}/lib'
-BF_FFMPEG_INC = '${BF_FFMPEG}/include'
+BF_FFMPEG_LIBPATH = LIBDIR + '/gcc/ffmpeg/lib'
+BF_FFMPEG_INC =  LIBDIR + '/gcc/ffmpeg/include'
 
 WITH_BF_SDL = 'true'
-BF_SDL = LCGDIR + '/sdl'
+BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
 BF_SDL_LIB = 'SDL'
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-BF_PTHREADS = LCGDIR + '/pthreads'
+BF_PTHREADS = LIBDIR + '/pthreads'
 BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadGC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
 WITH_BF_FMOD = 'false'
-BF_FMOD = LCGDIR + '/fmod'
+BF_FMOD = LIBDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
-BF_OPENEXR = LCGDIR + '/gcc/openexr'
+BF_OPENEXR = LIBDIR + '/gcc/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/OpenEXR'
 BF_OPENEXR_LIB = ' Half IlmImf Iex '
 BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
 
 WITH_BF_JPEG = 'true'
-BF_JPEG = LCGDIR + '/jpeg'
+BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
 BF_JPEG_LIB = 'jpeg'
 BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
 WITH_BF_PNG = 'true'
-BF_PNG = LCGDIR + '/png'
+BF_PNG = LIBDIR + '/png'
 BF_PNG_INC = '${BF_PNG}/include'
 BF_PNG_LIB = 'png'
 BF_PNG_LIBPATH = '${BF_PNG}/lib'
 
-BF_TIFF = LCGDIR + '/tiff'
+BF_TIFF = LIBDIR + '/tiff'
 BF_TIFF_INC = '${BF_TIFF}/include'
 
 WITH_BF_ZLIB = 'true'
-BF_ZLIB = LCGDIR + '/zlib'
+BF_ZLIB = LIBDIR + '/zlib'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
 #BF_ZLIB_LIB = 'z'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = 'true'
 
-BF_GETTEXT = LCGDIR + '/gettext'
+BF_GETTEXT = LIBDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gnu_gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_FTGL = 'true'
-BF_FTGL = LCGDIR + '/ftgl'
+BF_FTGL = LIBDIR + '/ftgl'
 BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE = 'false'
 
 WITH_BF_ODE = 'true'
-BF_ODE = LCGDIR + '/ode'
+BF_ODE = LIBDIR + '/ode'
 BF_ODE_INC = BF_ODE + '/include'
 BF_ODE_LIB = BF_ODE + '/lib/libode.a'
 
@@ -88,14 +94,14 @@ BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 #WITH_BF_NSPR = 'true'
-#BF_NSPR = $(LCGDIR)/nspr
+#BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
 #BF_NSPR_LIB = 
 
 # Uncomment the following line to use Mozilla inplace of netscape
 #CPPFLAGS += -DMOZ_NOT_NET
 # Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LCGDIR)/mozilla
+#BF_MOZILLA = $(LIBDIR)/mozilla
 #BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
 #BF_MOZILLA_LIB =
 # Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
@@ -105,7 +111,7 @@ BF_SOLID_LIB = 'extern_solid'
 #BF_PARANOID = 'true'
 
 # enable freetype2 support for text objects
-BF_FREETYPE = LCGDIR + '/gcc/freetype'
+BF_FREETYPE = LIBDIR + '/gcc/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype'
 BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py
index 0a9a1262264..ea9ac55681a 100644
--- a/config/win32-vc-config.py
+++ b/config/win32-vc-config.py
@@ -1,5 +1,12 @@
 LCGDIR = '#../lib/windows'
-BF_PYTHON = LCGDIR + '/python'
+LIBDIR = '${LCGDIR}'
+
+BF_VERSE = "#extern/verse/dist"
+BF_VERSE_LIBPATH = "${BF_BUILDDIR}/extern/verse/dist"
+BF_VERSE_INCLUDE = BF_VERSE
+BF_VERSE_LIBS = "libverse"
+
+BF_PYTHON = LIBDIR + '/python'
 BF_PYTHON_VERSION = '2.4'
 BF_PYTHON_INC = '${BF_PYTHON}/include/python${BF_PYTHON_VERSION}'
 BF_PYTHON_BINARY = 'python'
@@ -7,74 +14,74 @@ BF_PYTHON_LIB = 'python24'
 BF_PYTHON_LIBPATH = '${BF_PYTHON}/lib'
 
 WITH_BF_OPENAL = 'true'
-BF_OPENAL = LCGDIR + '/openal'
+BF_OPENAL = LIBDIR + '/openal'
 BF_OPENAL_INC = '${BF_OPENAL}/include ${BF_OPENAL}/include/AL '
 BF_OPENAL_LIB = 'openal_static'
 BF_OPENAL_LIBPATH = '${BF_OPENAL}/lib'
 
 WITH_BF_ICONV = 'true'
-BF_ICONV = LCGDIR + '/iconv'
+BF_ICONV = LIBDIR + '/iconv'
 BF_ICONV_INC = '${BF_ICONV}/include'
 BF_ICONV_LIB = 'iconv'
 BF_ICONV_LIBPATH = '${BF_ICONV}/lib'
 
 WITH_BF_SDL = 'true'
-BF_SDL = LCGDIR + '/sdl'
+BF_SDL = LIBDIR + '/sdl'
 BF_SDL_INC = '${BF_SDL}/include'
 BF_SDL_LIB = 'SDL.lib'
 BF_SDL_LIBPATH = '${BF_SDL}/lib'
 
-BF_PTHREADS = LCGDIR + '/pthreads'
+BF_PTHREADS = LIBDIR + '/pthreads'
 BF_PTHREADS_INC = '${BF_PTHREADS}/include'
 BF_PTHREADS_LIB = 'pthreadVC2'
 BF_PTHREADS_LIBPATH = '${BF_PTHREADS}/lib'
 
 WITH_BF_FMOD = 'false'
-BF_FMOD = LCGDIR + '/fmod'
+BF_FMOD = LIBDIR + '/fmod'
 
 WITH_BF_OPENEXR = 'true'
-BF_OPENEXR = LCGDIR + '/openexr'
+BF_OPENEXR = LIBDIR + '/openexr'
 BF_OPENEXR_INC = '${BF_OPENEXR}/include ${BF_OPENEXR}/include/IlmImf ${BF_OPENEXR}/include/Iex ${BF_OPENEXR}/include/Imath '
 BF_OPENEXR_LIB = ' Iex Half IlmImf Imath '
-BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib'
+BF_OPENEXR_LIBPATH = '${BF_OPENEXR}/lib_msvc'
 
 WITH_BF_JPEG = 'true'
-BF_JPEG = LCGDIR + '/jpeg'
+BF_JPEG = LIBDIR + '/jpeg'
 BF_JPEG_INC = '${BF_JPEG}/include'
 BF_JPEG_LIB = 'libjpeg'
 BF_JPEG_LIBPATH = '${BF_JPEG}/lib'
 
 WITH_BF_PNG = 'true'
-BF_PNG = LCGDIR + '/png'
+BF_PNG = LIBDIR + '/png'
 BF_PNG_INC = '${BF_PNG}/include'
 BF_PNG_LIB = 'libpng_st'
 BF_PNG_LIBPATH = '${BF_PNG}/lib'
 
-BF_TIFF = LCGDIR + '/tiff'
+BF_TIFF = LIBDIR + '/tiff'
 BF_TIFF_INC = '${BF_TIFF}/include'
 
 WITH_BF_ZLIB = 'true'
-BF_ZLIB = LCGDIR + '/zlib'
+BF_ZLIB = LIBDIR + '/zlib'
 BF_ZLIB_INC = '${BF_ZLIB}/include'
 BF_ZLIB_LIB = 'libz'
 BF_ZLIB_LIBPATH = '${BF_ZLIB}/lib'
 
 WITH_BF_INTERNATIONAL = 'true'
 
-BF_GETTEXT = LCGDIR + '/gettext'
+BF_GETTEXT = LIBDIR + '/gettext'
 BF_GETTEXT_INC = '${BF_GETTEXT}/include'
 BF_GETTEXT_LIB = 'gnu_gettext'
 BF_GETTEXT_LIBPATH = '${BF_GETTEXT}/lib'
 
 WITH_BF_FTGL = 'true'
-BF_FTGL = LCGDIR + '/ftgl'
+BF_FTGL = LIBDIR + '/ftgl'
 BF_FTGL_INC = '${BF_FTGL}/include'
 BF_FTGL_LIB = 'extern_ftgl'
 
 WITH_BF_GAMEENGINE = 'true'
 
 WITH_BF_ODE = 'true'
-BF_ODE = LCGDIR + '/ode'
+BF_ODE = LIBDIR + '/ode'
 BF_ODE_INC = BF_ODE + '/include'
 BF_ODE_LIB = BF_ODE + '/lib/libode.a'
 
@@ -88,14 +95,14 @@ BF_SOLID_INC = '${BF_SOLID}'
 BF_SOLID_LIB = 'extern_solid'
 
 #WITH_BF_NSPR = 'true'
-#BF_NSPR = $(LCGDIR)/nspr
+#BF_NSPR = $(LIBDIR)/nspr
 #BF_NSPR_INC = -I$(BF_NSPR)/include -I$(BF_NSPR)/include/nspr
 #BF_NSPR_LIB = 
 
 # Uncomment the following line to use Mozilla inplace of netscape
 #CPPFLAGS += -DMOZ_NOT_NET
 # Location of MOZILLA/Netscape header files...
-#BF_MOZILLA = $(LCGDIR)/mozilla
+#BF_MOZILLA = $(LIBDIR)/mozilla
 #BF_MOZILLA_INC = -I$(BF_MOZILLA)/include/mozilla/nspr -I$(BF_MOZILLA)/include/mozilla -I$(BF_MOZILLA)/include/mozilla/xpcom -I$(BF_MOZILLA)/include/mozilla/idl
 #BF_MOZILLA_LIB =
 # Will fall back to look in BF_MOZILLA_INC/nspr and BF_MOZILLA_LIB
@@ -105,13 +112,13 @@ BF_SOLID_LIB = 'extern_solid'
 #BF_PARANOID = 'true'
 
 # enable freetype2 support for text objects
-BF_FREETYPE = LCGDIR + '/freetype'
+BF_FREETYPE = LIBDIR + '/freetype'
 BF_FREETYPE_INC = '${BF_FREETYPE}/include ${BF_FREETYPE}/include/freetype2'
 BF_FREETYPE_LIB = 'freetype2ST'
 BF_FREETYPE_LIBPATH = '${BF_FREETYPE}/lib'
 
 WITH_BF_QUICKTIME = 'true' # -DWITH_QUICKTIME
-BF_QUICKTIME = LCGDIR + '/QTDevWin'
+BF_QUICKTIME = LIBDIR + '/QTDevWin'
 BF_QUICKTIME_INC = '${BF_QUICKTIME}/CIncludes'
 BF_QUICKTIME_LIB = 'qtmlClient'
 BF_QUICKTIME_LIBPATH = '${BF_QUICKTIME}/Libraries'
diff --git a/extern/SConscript b/extern/SConscript
index 8d7f691aa82..8dc03c2e260 100644
--- a/extern/SConscript
+++ b/extern/SConscript
@@ -10,3 +10,6 @@ if env['WITH_BF_GAMEENGINE']:
 
 if env['WITH_BF_INTERNATIONAL']:
     SConscript(['bFTGL/SConscript'])
+
+if env['WITH_BF_VERSE']:
+    SConscript(['verse/dist/SConstruct'])
diff --git a/extern/verse/dist/SConstruct b/extern/verse/dist/SConstruct
index ac6f6031b99..42c9a58a8c4 100644
--- a/extern/verse/dist/SConstruct
+++ b/extern/verse/dist/SConstruct
@@ -23,12 +23,9 @@ import time
 import string
 from distutils import sysconfig
 
-root_build_dir = '..' + os.sep + 'build' + os.sep
-
-config_file = 'config.opts'
-version = '1.0'
+Import('env')
 
-env = Environment ()
+root_build_dir = '..' + os.sep + 'build' + os.sep
 
 defines = []
 cflags = []
@@ -40,121 +37,89 @@ platform_libs = []
 platform_libpath = []
 platform_linkflags = []
 
-if sys.platform == 'win32':
+window_system = env['OURPLATFORM']
+if window_system == 'win32-vc':
     print "Building on win32"
     defines += ['_WIN32']
     warn_flags = ['/Wall']
     platform_libs = ['ws2_32']
-elif sys.platform == 'linux2':
+elif window_system == 'win32-mingw':
+    defines += ['_WIN32', 'WIN32']
+    platform_libs = ['shell32', 'kernel32', 'gdi32', 'user32', 'ws2_32']
+elif window_system == 'linux2':
     print "Building on linux2"
-elif sys.platform == 'openbsd3':
+elif window_system== 'openbsd3':
     print "Building on openbsd3"
 
-if os.path.exists (config_file):
-    print "Using config file: " + config_file
-else:
-    print "Creating new config file: " + config_file
-    env_dict = env.Dictionary()
-    config = open (config_file, 'w')
-    config.write ("#Configuration file for verse SCons user definable options.\n")
-    config.write ("BUILD_BINARY = 'release'\n")
-    config.write ("REGEN_PROTO = 'yes'\n")
-    config.write ("\n# Compiler information.\n")
-    config.write ("HOST_CC = %r\n"%(env_dict['CC']))
-    config.write ("HOST_CXX = %r\n"%(env_dict['CXX']))
-    config.write ("TARGET_CC = %r\n"%(env_dict['CC']))
-    config.write ("TARGET_CXX = %r\n"%(env_dict['CXX']))
-    config.write ("TARGET_AR = %r\n"%(env_dict['AR']))
-    config.write ("PATH = %r\n"%(os.environ['PATH']))
-
-user_options_env = Environment()
-user_options = Options (config_file)
-user_options.AddOptions(
-    (EnumOption ('BUILD_BINARY', 'release',
-        'Build a release or debug binary.',
-        allowed_values = ('release', 'debug'))),
-    ('BUILD_DIR', 'Target directory for intermediate files.',
-        root_build_dir),
-    (EnumOption ('REGEN_PROTO', 'yes',
-        'Whether to regenerate the protocol files',
-        allowed_values = ('yes', 'no'))),
-    ('HOST_CC', 'C compiler for the host platfor. This is the same as target platform when not cross compiling.'),
-    ('HOST_CXX', 'C++ compiler for the host platform. This is the same as target platform when not cross compiling.'),
-    ('TARGET_CC', 'C compiler for the target platform.'),
-    ('TARGET_CXX', 'C++ compiler for the target platform.'),
-    ('TARGET_AR', 'Linker command for linking libraries.'),
-    ('PATH', 'Standard search path')
-)
-user_options.Update (user_options_env)
-user_options_dict = user_options_env.Dictionary()
-
-root_build_dir = user_options_dict['BUILD_DIR']
-
-if user_options_dict['BUILD_BINARY'] == 'release':
+user_options_dict = env #user_options_env.Dictionary()
+
+root_build_dir = user_options_dict['BF_BUILDDIR'] + os.sep + "extern" + os.sep + "verse"
+
+if user_options_dict['VERSE_BUILD_BINARY'] == 'release':
     cflags = extra_flags + release_flags + warn_flags
-    if sys.platform == 'win32':
+    if window_system == 'win32-vc':
         defines += ['NDEBUG']
 else:
     cflags = extra_flags + debug_flags + warn_flags
-    if sys.platform == 'win32':
+    if window_system== 'win32-vc':
         #defines += ['_DEBUG'] specifying this makes msvc want to link to python22_d.lib??
         platform_linkflags += ['/DEBUG','/PDB:verse.pdb']
 
-library_env = Environment()
-library_env.Replace (CC = user_options_dict['TARGET_CC'])
-library_env.Replace (CXX = user_options_dict['TARGET_CXX'])
-library_env.Replace (PATH = user_options_dict['PATH'])
-library_env.Replace (AR = user_options_dict['TARGET_AR'])
+library_env = env.Copy() #Environment()
+library_env.Replace (CC = user_options_dict['CC'])
+library_env.Replace (CXX = user_options_dict['CXX'])
+#library_env.Replace (PATH = user_options_dict['PATH'])
+#library_env.Replace (AR = user_options_dict['TARGET_AR'])
 
 cmd_gen_files = (['v_cmd_gen.c',
-				  'v_cmd_def_a.c',
-				  'v_cmd_def_b.c',
-				  'v_cmd_def_c.c',
-				  'v_cmd_def_g.c',
-				  'v_cmd_def_m.c',
-				  'v_cmd_def_o.c',
-				  'v_cmd_def_s.c',
-				  'v_cmd_def_t.c'
-				  ])
+                  'v_cmd_def_a.c',
+                  'v_cmd_def_b.c',
+                  'v_cmd_def_c.c',
+                  'v_cmd_def_g.c',
+                  'v_cmd_def_m.c',
+                  'v_cmd_def_o.c',
+                  'v_cmd_def_s.c',
+                  'v_cmd_def_t.c'
+                  ])
 
 cmd_gen_deps = (['v_gen_pack_init.c',
-				 'v_gen_pack_a_node.c',
-				 'v_gen_pack_b_node.c',
-				 'v_gen_pack_c_node.c',
-				 'v_gen_pack_g_node.c',
-				 'v_gen_pack_m_node.c',
-				 'v_gen_pack_o_node.c',
-				 'v_gen_pack_s_node.c',
-				 'v_gen_pack_t_node.c',
-				])
-
-if user_options_dict['REGEN_PROTO']=='yes':
+                 'v_gen_pack_a_node.c',
+                 'v_gen_pack_b_node.c',
+                 'v_gen_pack_c_node.c',
+                 'v_gen_pack_g_node.c',
+                 'v_gen_pack_m_node.c',
+                 'v_gen_pack_o_node.c',
+                 'v_gen_pack_s_node.c',
+                 'v_gen_pack_t_node.c',
+                ])
+
+if user_options_dict['VERSE_REGEN_PROTO']=='yes':
     cmd_gen_env = library_env.Copy()
     cmd_gen_env.Append(CPPDEFINES=['V_GENERATE_FUNC_MODE'])
     mkprot = cmd_gen_env.Program(target='mkprot', source=cmd_gen_files)
     cmd_gen_env.Command('regen', '' , './mkprot')
 
 lib_source_files = (['v_cmd_buf.c',
-					 'v_connect.c',
-					 'v_connection.c',
-					 'v_encryption.c',
-					 'v_func_storage.c',
-					 'v_man_pack_node.c',
-					 'v_network.c',
-					 'v_network_in_que.c',
-					 'v_network_out_que.c',
-					 'v_pack.c',
-					 'v_pack_method.c',
-					 'v_prime.c',
-					 'v_randgen.c',
-					 'v_util.c',
-					 'v_bignum.c'
-					 ])
+                     'v_connect.c',
+                     'v_connection.c',
+                     'v_encryption.c',
+                     'v_func_storage.c',
+                     'v_man_pack_node.c',
+                     'v_network.c',
+                     'v_network_in_que.c',
+                     'v_network_out_que.c',
+                     'v_pack.c',
+                     'v_pack_method.c',
+                     'v_prime.c',
+                     'v_randgen.c',
+                     'v_util.c',
+                     'v_bignum.c'
+                     ])
 lib_source_files += cmd_gen_deps
 
 server_source_files = (['vs_connection.c',
                         'vs_main.c',
-						'vs_node_audio.c',
+                        'vs_node_audio.c',
                         'vs_node_bitmap.c',
                         'vs_node_curve.c',
                         'vs_node_geometry.c',
@@ -166,26 +131,21 @@ server_source_files = (['vs_connection.c',
                         'vs_node_text.c'
                         ])
 
-verse_example_sources = (['examples/list-nodes.c'])
-
 verselib_env = library_env.Copy()
 verselib_env.Append(CPPDEFINES = defines)
 
-verseserver_env = library_env.Copy()
+#server commented out for now, though maybe there
+#should be an option to build it.
+verseserver_env = env.Copy()
 verseserver_env.Append(CPPDEFINES = defines)
-verseserver_env.Append (LIBS=['libverse'])
-verseserver_env.Append (LIBPATH = ['.'])
+verseserver_env.Append (LIBS=['verse'])
 verseserver_env.Append (LIBS= platform_libs)
 
-verseexample_env = library_env.Copy()
-verseexample_env.Append(CPPDEFINES = defines)
-verseexample_env.Append (LIBS=['libverse'])
-verseexample_env.Append (LIBPATH = ['.'])
-verseexample_env.Append (LIBS= platform_libs)
-verseexample_env.Append (CPPPATH = ['.'])
+verselib = env.BlenderLib(libname='verse', sources=lib_source_files, includes=[], defines=defines, libtype=['core', 'intern'], priority = [5, 5])
 
-verselib = verselib_env.Library(target='libverse', source=lib_source_files)
-if user_options_dict['REGEN_PROTO']=='yes':
+verseserver_env.BlenderProg(builddir="#"+root_build_dir, progname="verse",
+  sources=server_source_files, libs=['verse'],
+  libpath='#'+user_options_dict['BF_BUILDDIR']+'/lib')
+ 
+if user_options_dict['VERSE_REGEN_PROTO']=='yes':
     verselib_env.Depends(verselib, mkprot)
-verseserver_env.Program(target='verse', source=server_source_files)
-verseexample_env.Program(target='list-nodes', source=verse_example_sources)
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) {
diff --git a/tools/Blender.py b/tools/Blender.py
index c1e43d9ceeb..9e94dd44ea4 100644
--- a/tools/Blender.py
+++ b/tools/Blender.py
@@ -402,6 +402,7 @@ class BlenderEnvironment(SConsEnvironment):
         if  lenv['OURPLATFORM']=='darwin':
             lenv['BINARYKIND'] = binarykind
             lenv.AddPostAction(prog,Action(AppIt,strfunction=my_appit_print))
+        return prog
 
     def Glob(lenv, pattern):
         path = string.replace(GetBuildPath(lenv,'SConscript'),'SConscript', '')
diff --git a/tools/btools.py b/tools/btools.py
index b3bb097a240..cd860b093ca 100755
--- a/tools/btools.py
+++ b/tools/btools.py
@@ -41,12 +41,14 @@ def validate_arguments(args, bc):
             'CFLAGS', 'CCFLAGS', 'CPPFLAGS', 
             'REL_CFLAGS', 'REL_CCFLAGS',
             'C_WARN', 'CC_WARN', 'LLIBS', 'PLATFORM_LINKFLAGS',
-            'BF_PROFILE_FLAGS' ]
+            'BF_PROFILE_FLAGS', 'LCGDIR', 'WITH_BF_VERSE', 
+            'BF_VERSE', 'BF_VERSE_LIBPATH', 'BF_VERSE_INCLUDE', 'BF_VERSE_LIB',
+            'VERSE_BUILD_BINARY', 'VERSE_BUILD_DIR', 'VERSE_REGEN_PROTO']
+
     arg_list = ['BF_DEBUG', 'BF_QUIET', 'BF_CROSS', 'BF_UPDATE',
             'BF_INSTALLDIR', 'BF_TOOLSET', 'BF_BINNAME',
             'BF_BUILDDIR', 'BF_FANCY', 'BF_QUICK', 'BF_PROFILE', 'BF_DEBUG', 'BF_DEBUG_FLAGS',
-            'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', "BF_QUICKDEBUG", "BF_LISTDEBUG"
-           ]
+            'BF_PRIORITYLIST', 'BF_BUILDINFO','CC', 'CXX', "BF_QUICKDEBUG", "BF_LISTDEBUG", 'LCGDIR']
 
     all_list = opts_list + arg_list
     okdict = {}
@@ -110,7 +112,18 @@ def SetupBufferedOutput( env ):
 def read_opts(cfg, args):
     localopts = Options.Options(cfg, args)
     localopts.AddOptions(
-        ('LCGDIR', 'The path to the CVS Lib folder, if you platform has it'),
+        ('VERSE_BUILD_BINARY', 'Build a release or debug binary.', 'release'),
+        ('VERSE_BUILD_DIR', 'Target directory for intermediate files.', "${BF_BUILDDIR}/extern/verse"),
+        ('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'),
+        (BoolOption('WITH_BF_VERSE', 'Use VERSE if true', 'false')),
+        ('BF_VERSE',  'verse dir', '/usr/lib'),
+        ('BF_VERSE_LIBPATH', 'verse lib dir',  '/usr/lib'),
+        ('BF_VERSE_INCLUDE', 'verse include dir', '/usr/include'),
+        ('BF_VERSE_LIB', 'verse libs', ''),
+        ('LCGDIR', 'location of cvs lib dir'),
+        ('VERSE_BUILD_BINARY', 'Build a release or debug binary.', 'release'),
+        ('VERSE_BUILD_DIR', 'Target directory for intermediate files.', "${BF_BUILDDIR}/extern/verse"),
+        ('VERSE_REGEN_PROTO', 'Whether to regenerate the protocol files', 'yes'),
         ('BF_DEBUG_LIBS', 'list of libraries to build with debug symbols'),
         ('BF_PYTHON', 'base path for python', ''),
         ('BF_PYTHON_VERSION', 'Python version to use', ''),
@@ -149,9 +162,11 @@ def read_opts(cfg, args):
         (BoolOption('WITH_BF_FFMPEG', 'Use FFMPEG if true', 'false')),
         ('BF_FFMPEG', 'FFMPEG base path', ''),
         ('BF_FFMPEG_LIB', 'FFMPEG library', ''),
+
         ('BF_FFMPEG_INC', 'FFMPEG includes', ''),
         ('BF_FFMPEG_LIBPATH', 'FFMPEG library path', ''),
         
+
         (BoolOption('WITH_BF_JPEG', 'Use JPEG if true', 'true')),
         ('BF_JPEG', 'JPEG base path', ''),
         ('BF_JPEG_INC', 'JPEG include path', ''),