accident when merge. revert to r37405
This commit is contained in:
@@ -43,9 +43,6 @@ set(INC
|
||||
../../../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(INC_SYS
|
||||
|
||||
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 @@ if(WITH_OPENCOLLADA)
|
||||
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 @@ if(WITH_GAMEENGINE)
|
||||
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}")
|
||||
|
||||
Reference in New Issue
Block a user