diff options
author | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 21:08:32 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2012-01-17 21:08:32 +0400 |
commit | 47b9f5d8f83e330342fd22c5b56b2623bde06d8c (patch) | |
tree | 0446fc03fdfbc2d34c1fbfb1c80bb7ccae286675 /build_files | |
parent | b805334cc283ea0126f81078830a3d6dcea97e40 (diff) | |
parent | a8081c1d2bb9115833493b011bb93d6c08112b2d (diff) |
svn merge ^/trunk/blender -r43443:43461
Diffstat (limited to 'build_files')
-rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 3 | ||||
-rw-r--r-- | build_files/scons/tools/btools.py | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 26fa7623f21..e72a0fff355 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -15,6 +15,7 @@ set(WITH_CODEC_SNDFILE OFF CACHE FORCE BOOL) set(WITH_CYCLES OFF CACHE FORCE BOOL) set(WITH_FFTW3 OFF CACHE FORCE BOOL) set(WITH_LIBMV OFF CACHE FORCE BOOL) +set(WITH_CARVE OFF CACHE FORCE BOOL) set(WITH_GAMEENGINE OFF CACHE FORCE BOOL) set(WITH_IK_ITASC OFF CACHE FORCE BOOL) set(WITH_IMAGE_CINEON OFF CACHE FORCE BOOL) @@ -33,6 +34,7 @@ set(WITH_LZO OFF CACHE FORCE BOOL) set(WITH_MOD_BOOLEAN OFF CACHE FORCE BOOL) set(WITH_MOD_DECIMATE OFF CACHE FORCE BOOL) set(WITH_MOD_FLUID OFF CACHE FORCE BOOL) +set(WITH_MOD_REMESH OFF CACHE FORCE BOOL) set(WITH_MOD_SMOKE OFF CACHE FORCE BOOL) set(WITH_MOD_OCEANSIM OFF CACHE FORCE BOOL) set(WITH_AUDASPACE OFF CACHE FORCE BOOL) @@ -43,3 +45,4 @@ set(WITH_PYTHON_INSTALL OFF CACHE FORCE BOOL) set(WITH_RAYOPTIMIZATION OFF CACHE FORCE BOOL) set(WITH_SDL OFF CACHE FORCE BOOL) set(WITH_X11_XINPUT OFF CACHE FORCE BOOL) +set(WITH_X11_XF86VMODE OFF CACHE FORCE BOOL) diff --git a/build_files/scons/tools/btools.py b/build_files/scons/tools/btools.py index 296d518596a..a71ab04b888 100644 --- a/build_files/scons/tools/btools.py +++ b/build_files/scons/tools/btools.py @@ -222,15 +222,15 @@ class ourSpawn: newargs = string.join(args[1:], ' ') cmdline = cmd + " " + newargs startupinfo = subprocess.STARTUPINFO() - startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW + #startupinfo.dwFlags |= subprocess.STARTF_USESHOWWINDOW proc = subprocess.Popen(cmdline, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE, startupinfo=startupinfo, shell = False) data, err = proc.communicate() rv = proc.wait() - if rv: - print "=====" - print err - print "=====" + if data: + print(data) + if err: + print(err) return rv def SetupSpawn( env ): |