[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [37415] branches/soc-2011-garlic/source/ blender/windowmanager/CMakeLists.txt: accident when merge.
xiao xiangquan
xiaoxiangquan at gmail.com
Sat Jun 11 20:30:39 CEST 2011
Revision: 37415
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37415
Author: xiaoxiangquan
Date: 2011-06-11 18:30:39 +0000 (Sat, 11 Jun 2011)
Log Message:
-----------
accident when merge. revert to r37405
Revision Links:
--------------
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37405
Modified Paths:
--------------
branches/soc-2011-garlic/source/blender/windowmanager/CMakeLists.txt
Modified: branches/soc-2011-garlic/source/blender/windowmanager/CMakeLists.txt
===================================================================
--- branches/soc-2011-garlic/source/blender/windowmanager/CMakeLists.txt 2011-06-11 18:15:46 UTC (rev 37414)
+++ branches/soc-2011-garlic/source/blender/windowmanager/CMakeLists.txt 2011-06-11 18:30:39 UTC (rev 37415)
@@ -43,9 +43,6 @@
../../../intern/ghost
../../../intern/opennl/extern
../../../source/gameengine/BlenderRoutines
-)
-
-set(INC_SYS
${ZLIB_INCLUDE_DIRS}
${OPENGL_INCLUDE_DIR}
${GLEW_INCLUDE_PATH}
@@ -53,6 +50,7 @@
set(SRC
intern/wm.c
+ intern/wm_apple.c
intern/wm_cursors.c
intern/wm_dragdrop.c
intern/wm_draw.c
@@ -89,18 +87,17 @@
endif()
if(WITH_CODEC_QUICKTIME)
- list(APPEND INC ../quicktime)
- list(APPEND INC_SYS ${QUICKTIME_INC})
+ list(APPEND INC ../quicktime ${QUICKTIME_INC})
add_definitions(-DWITH_QUICKTIME)
endif()
if(WITH_CODEC_FFMPEG)
- list(APPEND INC_SYS ${FFMPEG_INC})
+ list(APPEND INC ${FFMPEG_INC})
add_definitions(-DWITH_FFMPEG)
endif()
if(WITH_PYTHON)
- list(APPEND INC ../python)
+ list(APPEND INC ../python ${PYTHON_INCLUDE_DIRS})
add_definitions(-DWITH_PYTHON)
if(WITH_PYTHON_SECURITY)
@@ -112,16 +109,12 @@
add_definitions(-DWITH_GAMEENGINE)
endif()
-if(APPLE)
- if(NOT WITH_COCOA)
- list(APPEND SRC
- intern/wm_apple.c
- )
- endif()
+if(WITH_COCOA)
+ list(REMOVE_ITEM SRC "${CMAKE_CURRENT_SOURCE_DIR}/intern/wm_apple.c")
endif()
if(WITH_BUILDINFO)
add_definitions(-DNAN_BUILDINFO)
endif()
-blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}" "${INC_SYS}")
+blender_add_lib_nolist(bf_windowmanager "${SRC}" "${INC}")
More information about the Bf-blender-cvs
mailing list