Index: tools/btools.py =================================================================== RCS file: /cvsroot/bf-blender/blender/tools/btools.py,v retrieving revision 1.19 diff -u -r1.19 btools.py --- tools/btools.py 3 Nov 2006 08:13:01 -0000 1.19 +++ tools/btools.py 11 Nov 2006 16:42:23 -0000 @@ -31,7 +31,7 @@ 'WITH_BF_ICONV', 'BF_ICONV', 'BF_ICONV_INC', 'BF_ICONV_LIB', 'BF_ICONV_LIBPATH', 'WITH_BF_ODE', 'BF_ODE', 'BF_ODE_INC', 'BF_ODE_LIB', 'WITH_BF_GAMEENGINE', 'WITH_BF_BULLET', 'BF_BULLET', 'BF_BULLET_INC', 'BF_BULLET_LIB', - 'BF_SOLID', 'BF_SOLID_INC', + 'BF_SOLID', 'BF_SOLID_INC', 'BF_WINTAB', 'BF_WINTAB_INC', 'WITH_BF_YAFRAY', 'BF_FREETYPE', 'BF_FREETYPE_INC', 'BF_FREETYPE_LIB', 'BF_FREETYPE_LIBPATH', 'WITH_BF_QUICKTIME', 'BF_QUICKTIME', 'BF_QUICKTIME_INC', 'BF_QUICKTIME_LIB', 'BF_QUICKTIME_LIBPATH', @@ -215,6 +215,8 @@ ('BF_SOLID', 'Solid base dir', '#/extern/solid'), ('BF_SOLID_INC', 'Solid include path', ''), + ('BF_WINTAB', 'WinTab base dir', ''), + ('BF_WINTAB_INC', 'WinTab include dir', ''), ## ##WITH_BF_NSPR = 'true' ##BF_NSPR = $(LCGDIR)/nspr Index: intern/ghost/SConscript =================================================================== RCS file: /cvsroot/bf-blender/blender/intern/ghost/SConscript,v retrieving revision 1.15 diff -u -r1.15 SConscript --- intern/ghost/SConscript 7 Nov 2006 06:44:44 -0000 1.15 +++ intern/ghost/SConscript 11 Nov 2006 16:43:02 -0000 @@ -28,5 +28,5 @@ incs = '. ../string ' + env['BF_OPENGL_INC'] if window_system in ('win32-vc', 'win32-mingw', 'cygwin', 'linuxcross'): - incs = '#../lib/windows/wintab/INCLUDE ' + incs + incs = env['BF_WINTAB_INC'] + ' ' + incs env.BlenderLib ('bf_ghost', sources, Split(incs), [], libtype=['core','player'], priority = [25,15] ) Index: config/win32-mingw-config.py =================================================================== RCS file: /cvsroot/bf-blender/blender/config/win32-mingw-config.py,v retrieving revision 1.22 diff -u -r1.22 win32-mingw-config.py --- config/win32-mingw-config.py 9 Nov 2006 15:45:18 -0000 1.22 +++ config/win32-mingw-config.py 11 Nov 2006 16:15:03 -0000 @@ -91,6 +91,9 @@ BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' +BF_WINTAB = LIBDIR + '/wintab' +BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' + WITH_BF_YAFRAY = 'true' #WITH_BF_NSPR = 'true' Index: config/win32-vc-config.py =================================================================== RCS file: /cvsroot/bf-blender/blender/config/win32-vc-config.py,v retrieving revision 1.18 diff -u -r1.18 win32-vc-config.py --- config/win32-vc-config.py 10 Nov 2006 18:01:18 -0000 1.18 +++ config/win32-vc-config.py 11 Nov 2006 16:15:16 -0000 @@ -92,6 +92,9 @@ BF_SOLID_INC = '${BF_SOLID}' BF_SOLID_LIB = 'extern_solid' +BF_WINTAB = LIBDIR + '/wintab' +BF_WINTAB_INC = '${BF_WINTAB}/INCLUDE' + WITH_BF_YAFRAY = 'true' #WITH_BF_NSPR = 'true'