diff options
| author | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-25 17:53:27 +0300 |
|---|---|---|
| committer | Nathan Letwory <nathan@letworyinteractive.com> | 2006-02-25 17:53:27 +0300 |
| commit | d9f9e765009d264b43cd93f730bf7730af2d873d (patch) | |
| tree | de47fa9be8032e668925260a99ee050b0bd0efca /tools | |
| parent | fa1129dc1d52f40af2ca5c986a2feb5f7a320041 (diff) | |
==SCons==
+ SCons support for pthreads-win32. Library will be committed shortly into
lib/windows, so be sure to check commit list and update that as well
when the pthread lib is available.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Blender.py | 6 | ||||
| -rwxr-xr-x | tools/btools.py | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/tools/Blender.py b/tools/Blender.py index ad744697c7a..1243fb7d309 100644 --- a/tools/Blender.py +++ b/tools/Blender.py @@ -124,6 +124,9 @@ def setup_staticlibs(lenv): if lenv['WITH_BF_STATICOPENGL']: statlibs += Split(lenv['BF_OPENGL_LIB_STATIC']) + if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): + libincs += Split(lenv['BF_PTHREADS_LIBPATH']) + return statlibs, libincs def setup_syslibs(lenv): @@ -147,6 +150,9 @@ def setup_syslibs(lenv): syslibs += Split(lenv['BF_SDL_LIB']) if not lenv['WITH_BF_STATICOPENGL']: syslibs += Split(lenv['BF_OPENGL_LIB']) + if lenv['OURPLATFORM'] in ('win32-vc', 'win32-mingw'): + syslibs += Split(lenv['BF_PTHREADS_LIB']) + syslibs += Split(lenv['LLIBS']) return syslibs diff --git a/tools/btools.py b/tools/btools.py index ba14712c201..2c80bd7131c 100755 --- a/tools/btools.py +++ b/tools/btools.py @@ -18,6 +18,7 @@ def validate_arguments(args, bc): 'BF_PYTHON', 'BF_PYTHON_VERSION', 'BF_PYTHON_INC', 'BF_PYTHON_BINARY', 'BF_PYTHON_LIB', 'BF_PYTHON_LIBPATH', 'BF_PYTHON_LINKFLAGS', 'WITH_BF_OPENAL', 'BF_OPENAL', 'BF_OPENAL_INC', 'BF_OPENAL_LIB', 'BF_OPENAL_LIBPATH', 'WITH_BF_SDL', 'BF_SDL', 'BF_SDL_INC', 'BF_SDL_LIB', 'BF_SDL_LIBPATH', + 'BF_PTHREADS', 'BF_PTHREADS_INC', 'BF_PTHREADS_LIB', 'BF_PTHREADS_LIBPATH', 'WITH_BF_FMOD', 'WITH_BF_OPENEXR', 'BF_OPENEXR', 'BF_OPENEXR_INC', 'BF_OPENEXR_LIB', 'BF_OPENEXR_LIBPATH', 'WITH_BF_FFMPEG', 'BF_FFMPEG_LIB', @@ -129,6 +130,11 @@ def read_opts(cfg, args): ('BF_SDL_LIB', 'SDL library', ''), #$(shell $(BF_SDL)/bin/sdl-config --libs) -lSDL_mixer ('BF_SDL_LIBPATH', 'SDL library path', ''), + ('BF_PTHREADS', 'Pthreads base path', ''), + ('BF_PTHREADS_INC', 'Pthreads include path', ''), + ('BF_PTHREADS_LIB', 'Pthreads library', ''), + ('BF_PTHREADS_LIBPATH', 'Pthreads library path', ''), + (BoolOption('WITH_BF_FMOD', 'Use FMOD if true', 'false')), # BF_FMOD = $(LCGDIR)/fmod |