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
diff options
context:
space:
mode:
authorCampbell Barton <ideasman42@gmail.com>2011-07-26 07:55:23 +0400
committerCampbell Barton <ideasman42@gmail.com>2011-07-26 07:55:23 +0400
commitfc95382a977163a1d499c732960e7501cc065833 (patch)
tree3bbbe419ba513f030f95715c04a8adb39c6e6579 /source/blender/blenpluginapi
parentac2dd4099167d9ab6306f3fcb83610a5d01ffae1 (diff)
parentce0ad0b40b93fc6074daaba6ead0e0e82867d4d2 (diff)
svn merge -r38400:38500 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'source/blender/blenpluginapi')
-rw-r--r--source/blender/blenpluginapi/CMakeLists.txt6
1 files changed, 4 insertions, 2 deletions
diff --git a/source/blender/blenpluginapi/CMakeLists.txt b/source/blender/blenpluginapi/CMakeLists.txt
index a5af15d7f55..9d398291b85 100644
--- a/source/blender/blenpluginapi/CMakeLists.txt
+++ b/source/blender/blenpluginapi/CMakeLists.txt
@@ -28,9 +28,9 @@ set(INC
.
..
../blenlib
+ ../blenloader
../imbuf
../makesdna
- ../blenloader
../../../intern/guardedalloc
)
@@ -50,7 +50,9 @@ set(SRC
)
if(WITH_CODEC_QUICKTIME)
- list(APPEND INC_SYS ${QUICKTIME_INCLUDE_DIRS})
+ list(APPEND INC_SYS
+ ${QUICKTIME_INCLUDE_DIRS}
+ )
add_definitions(-DWITH_QUICKTIME)
endif()