Revision: 37753
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37753
Author: campbellbarton
Date: 2011-06-23 15:58:41 +0000 (Thu, 23 Jun 2011)
Log Message:
-----------
correction to recent commit & made ffmpeg includes only add when enabled.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/blenlib/CMakeLists.txt
trunk/blender/source/blender/imbuf/CMakeLists.txt
trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-06-23 15:12:05 UTC (rev 37752)
+++ trunk/blender/CMakeLists.txt 2011-06-23 15:58:41 UTC (rev 37753)
@@ -203,8 +203,8 @@
message(FATAL_ERROR "WITH_PLAYER requires WITH_GAMEENGINE")
endif()
-if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
- message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK require
WITH_AUDASPACE")
+if(NOT WITH_AUDASPACE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK OR
WITH_CODEC_FFMPEG))
+ message(FATAL_ERROR "WITH_OPENAL/WITH_SDL/WITH_JACK/WITH_CODEC_FFMPEG
require WITH_AUDASPACE")
endif()
if(NOT WITH_SAMPLERATE AND (WITH_OPENAL OR WITH_SDL OR WITH_JACK))
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-06-23
15:12:05 UTC (rev 37752)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-06-23
15:58:41 UTC (rev 37753)
@@ -43,7 +43,6 @@
../nodes
../editors/include
../render/extern/include
- ../../../intern/ffmpeg
../../../intern/bsp/extern ../blenfont
../../../intern/decimation/extern
../../../intern/elbeem/extern
@@ -284,6 +283,7 @@
endif()
if(WITH_CODEC_FFMPEG)
+ list(APPEND INC ../../../intern/ffmpeg)
list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
add_definitions(-DWITH_FFMPEG)
endif()
Modified: trunk/blender/source/blender/blenlib/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenlib/CMakeLists.txt 2011-06-23 15:12:05 UTC
(rev 37752)
+++ trunk/blender/source/blender/blenlib/CMakeLists.txt 2011-06-23 15:58:41 UTC
(rev 37753)
@@ -52,6 +52,7 @@
intern/DLRB_tree.c
intern/boxpack2d.c
intern/bpath.c
+ intern/callbacks.c
intern/cpu.c
intern/dynlib.c
intern/edgehash.c
Modified: trunk/blender/source/blender/imbuf/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/imbuf/CMakeLists.txt 2011-06-23 15:12:05 UTC
(rev 37752)
+++ trunk/blender/source/blender/imbuf/CMakeLists.txt 2011-06-23 15:58:41 UTC
(rev 37753)
@@ -38,7 +38,6 @@
../makesdna
../../../intern/memutil
../../../intern/guardedalloc
- ../../../intern/ffmpeg
)
set(INC_SYS
@@ -135,6 +134,7 @@
endif()
if(WITH_CODEC_FFMPEG)
+ list(APPEND INC ../../../intern/ffmpeg)
list(APPEND INC_SYS ${FFMPEG_INCLUDE_DIRS})
add_definitions(-DWITH_FFMPEG)
endif()
Modified: trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
===================================================================
--- trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
2011-06-23 15:12:05 UTC (rev 37752)
+++ trunk/blender/source/gameengine/BlenderRoutines/CMakeLists.txt
2011-06-23 15:58:41 UTC (rev 37753)
@@ -59,13 +59,13 @@
add_definitions(-DGLEW_STATIC)
if(WITH_AUDASPACE)
+ list(APPEND INC
+ ../../../intern/audaspace/intern
+ )
add_definitions(-DWITH_AUDASPACE)
endif()
if(WITH_CODEC_FFMPEG)
- list(APPEND INC
- ../../../intern/audaspace/intern
- )
add_definitions(-DWITH_FFMPEG)
endif()
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
