From 9a85013692322f8a821b8228ad552f84d2a215e9 Mon Sep 17 00:00:00 2001 From: Brecht Van Lommel Date: Thu, 15 Apr 2010 10:28:32 +0000 Subject: Merge various small changes from render branch: * Division by zero fix for TNT SVD code. * Sound fix, in case ffmpeg decode fails, don't use the samples. * Fix for incorrect bounds of transformed objects in new raytracing code. * Gave memory arena's a name used for allocations for easier memory usage debugging. * Dupligroup no_draw option was using layers but not restrict view/render setting. (not a bugfix exactly but would do display list context switching while drawing for no reason). * Fix objects instanced on hair particles not giving consistent results when the object is transformed. * New math functions: madd_v4_v4fl, len_squared_v3v3, interp_v4_v4v4v4, mul_v4_m4v4, SH and form factor functions, box_minmax_bounds_m4. * mul_m4_m4m4 and mul_m3_m3m3 now accept the same pointers for multiple arguments. * endjob callback for WM jobs system. * Geometry node uv/color layer now has search list/autocomplete. * Various small buildsystem tweaks, not strictly needed yet in trunk. --- source/creator/CMakeLists.txt | 4 +++- source/creator/SConscript | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'source/creator') diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index cf1a4c6c0e8..42883ffd4dd 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -49,7 +49,9 @@ INCLUDE_DIRECTORIES(../../intern/guardedalloc ../../extern/glew/include ) - +IF(WIN32) + INCLUDE_DIRECTORIES(${PTHREADS_INC}) +ENDIF(WIN32) IF(WITH_QUICKTIME) ADD_DEFINITIONS(-DWITH_QUICKTIME) diff --git a/source/creator/SConscript b/source/creator/SConscript index 89506bdefc8..6364f256cc5 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -43,4 +43,7 @@ if env['BF_BUILDINFO']: if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): incs += ' ' + env['BF_PTHREADS_INC'] +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] + env.BlenderLib ( libname = 'bf_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 0 ) -- cgit v1.2.3