Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/intern
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2009-07-10 12:05:13 +0400
committerJoerg Mueller <nexyon@gmail.com>2009-07-10 12:05:13 +0400
commit8a27080f00daca5f9e3c293808826371f8aee23f (patch)
tree72ef7943e4fe55617564a365eab83e8c40b04876 /intern
parent3e160cbe4ba328326a14afab73b59297048538a9 (diff)
Added pthreads includes for windows building.
Diffstat (limited to 'intern')
-rw-r--r--intern/audaspace/CMakeLists.txt4
-rw-r--r--intern/audaspace/SConscript2
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/audaspace/CMakeLists.txt b/intern/audaspace/CMakeLists.txt
index a9a9f37bc2d..3eed151732a 100644
--- a/intern/audaspace/CMakeLists.txt
+++ b/intern/audaspace/CMakeLists.txt
@@ -24,10 +24,10 @@ SET(INC . intern SDL ffmpeg)
IF(WITH_FFMPEG)
FILE(GLOB SRC ffmpeg/*.cpp SDL/*.cpp intern/*.cpp intern/*.h)
- INCLUDE_DIRECTORIES(${SDL_INC} ${FFMPEG_INC})
+ INCLUDE_DIRECTORIES(${SDL_INC} ${FFMPEG_INC} ${PTHREADS_INC})
ELSE(WITH_FFMPEG)
FILE(GLOB SRC SDL/*.cpp intern/*.cpp intern/*.h)
- INCLUDE_DIRECTORIES(${SDL_INC})
+ INCLUDE_DIRECTORIES(${SDL_INC} ${PTHREADS_INC})
ENDIF(WITH_FFMPEG)
BLENDERLIB(bf_audaspace "${SRC}" "${INC}")
diff --git a/intern/audaspace/SConscript b/intern/audaspace/SConscript
index 203f454c096..4ef723a7093 100644
--- a/intern/audaspace/SConscript
+++ b/intern/audaspace/SConscript
@@ -4,7 +4,7 @@ Import ('env')
sources = env.Glob('SDL/*.cpp') + env.Glob('intern/*.cpp')
-incs = '. intern intern SDL ffmpeg ' + env['BF_SDL_INC']
+incs = '. intern intern SDL ffmpeg ' + env['BF_SDL_INC'] + ' ' + env['BF_PTHREADS_INC']
defs = ''
if env['WITH_BF_FFMPEG']:
sources += env.Glob('ffmpeg/*.cpp')