diff options
| -rw-r--r-- | config/win32-mingw-config.py | 3 | ||||
| -rw-r--r-- | config/win32-vc-config.py | 3 | ||||
| -rw-r--r-- | intern/ghost/SConscript | 2 | ||||
| -rwxr-xr-x | tools/btools.py | 4 |
4 files changed, 10 insertions, 2 deletions
diff --git a/config/win32-mingw-config.py b/config/win32-mingw-config.py index f84bf45c585..62425c745cd 100644 --- a/config/win32-mingw-config.py +++ b/config/win32-mingw-config.py @@ -91,6 +91,9 @@ BF_SOLID = '#extern/solid' 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' diff --git a/config/win32-vc-config.py b/config/win32-vc-config.py index eb0a2ca2939..5ce6745e85c 100644 --- a/config/win32-vc-config.py +++ b/config/win32-vc-config.py @@ -92,6 +92,9 @@ BF_SOLID = '#extern/solid' 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' diff --git a/intern/ghost/SConscript b/intern/ghost/SConscript index f1393472a01..40968e816a9 100644 --- a/intern/ghost/SConscript +++ b/intern/ghost/SConscript @@ -28,5 +28,5 @@ else: 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), defines=['_USE_MATH_DEFINES'], libtype=['core','player'], priority = [25,15] ) diff --git a/tools/btools.py b/tools/btools.py index 9a454baad1b..ab74fdf4fe4 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -31,7 +31,7 @@ def validate_arguments(args, bc): '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 @@ def read_opts(cfg, args): ('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 |