diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-10-23 03:22:05 +0400 |
| commit | 8f788c64db587e74079d812dbcea40c2bd4b91ff (patch) | |
| tree | c767e8318a9e7aded16be6cab2042f3ea11e7912 /source/blender/blenpluginapi | |
| parent | 36bb566d4e6e06e08d782d610d60d755cbda2396 (diff) | |
merge with trunk/2.5 at r23876
[[Split portion of a mixed commit.]]
Diffstat (limited to 'source/blender/blenpluginapi')
| -rw-r--r-- | source/blender/blenpluginapi/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/blenpluginapi/SConscript | 9 |
2 files changed, 13 insertions, 0 deletions
diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt index 1c5e2697c01..e6087a001f8 100644 --- a/source/blender/blenpluginapi/CMakeLists.txt +++ b/source/blender/blenpluginapi/CMakeLists.txt @@ -30,6 +30,10 @@ SET(INC . .. ../../../intern/guardedalloc ../blenlib ../imbuf ../makesdna ) +IF(WIN32) + SET(INC ${INC} ${PTHREADS_INC}) +ENDIF(WIN32) + IF(WITH_QUICKTIME) SET(INC ${INC} ${QUICKTIME_INC}) ADD_DEFINITIONS(-DWITH_QUICKTIME) diff --git a/source/blender/blenpluginapi/SConscript b/source/blender/blenpluginapi/SConscript index af69b4519b4..77faaa7b7f4 100644 --- a/source/blender/blenpluginapi/SConscript +++ b/source/blender/blenpluginapi/SConscript @@ -7,8 +7,17 @@ incs = '. .. #/intern/guardedalloc ../blenlib ../imbuf ../makesdna' defs = [] +incs += ' ' + env["BF_PTHREADS_INC"] + if env['WITH_BF_QUICKTIME']: defs.append('WITH_QUICKTIME') incs += ' ' + env['BF_QUICKTIME_INC'] +if env['OURPLATFORM'] == 'linux2': + cflags='-pthread' + incs += ' ../../../extern/binreloc/include' + +if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'): + incs += ' ' + env['BF_PTHREADS_INC'] + env.BlenderLib ( libname = 'bf_blenpluginapi', sources = sources, includes = Split(incs), defines = defs, libtype=['core'], priority = [170] ) |