kannonier8/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

minor cleanup, no functional changes.

Browse Source
This commit is contained in:
Campbell Barton 2011-05-09 14:41:44 +00:00
parent 18e9d9c3e2
commit 1e0c3d315b
11 changed files with 27 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/ghost/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set(INC
../string ../string
../../source/blender/imbuf ../../source/blender/imbuf
../../source/blender/makesdna ../../source/blender/makesdna
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

3
source/blender/CMakeLists.txt
View File

@ -123,6 +123,5 @@ if(WITH_PYTHON)
endif() endif()
if(WITH_OPENCOLLADA) if(WITH_OPENCOLLADA)
add_subdirectory(collada) add_subdirectory(collada)
endif() endif()

2
source/blender/blenfont/CMakeLists.txt
View File

@ -29,7 +29,7 @@ set(INC
../editors/include ../editors/include
../blenkernel ../blenkernel
../../../intern/guardedalloc ../../../intern/guardedalloc
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}
${FREETYPE_INCLUDE_DIRS} ${FREETYPE_INCLUDE_DIRS}
) )

4
source/blender/blenkernel/CMakeLists.txt
View File

@ -53,7 +53,7 @@ set(INC
../../../intern/opennl/extern ../../../intern/opennl/extern
../../../intern/smoke/extern ../../../intern/smoke/extern
../../../intern/mikktspace ../../../intern/mikktspace
../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h ../../../source/blender/windowmanager # XXX - BAD LEVEL CALL WM_api.h
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}
${ZLIB_INCLUDE_DIRS} ${ZLIB_INCLUDE_DIRS}
) )
@ -314,7 +314,7 @@ if(WITH_LZMA)
endif() endif()
if(MSVC) if(MSVC)
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
endif() endif()
blender_add_lib(bf_blenkernel "${SRC}" "${INC}") blender_add_lib(bf_blenkernel "${SRC}" "${INC}")

3
source/blender/editors/include/ED_image.h
View File

@ -68,8 +68,5 @@ int ED_space_image_show_uvshadow(struct SpaceImage *sima, struct Object *obedit)
/* UI level image (texture) updating... render calls own stuff (too) */ /* UI level image (texture) updating... render calls own stuff (too) */
void ED_image_update_frame(const struct Main *mainp, int cfra); void ED_image_update_frame(const struct Main *mainp, int cfra);
/* image_render.c, export for screen_ops.c, render operator */
void ED_space_image_output(struct bContext *C);
#endif /* ED_IMAGE_H */ #endif /* ED_IMAGE_H */

2
source/blender/editors/render/CMakeLists.txt
View File

@ -32,7 +32,7 @@ set(INC
../../render/extern/include ../../render/extern/include
../../windowmanager ../../windowmanager
../../../../intern/guardedalloc ../../../../intern/guardedalloc
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

2
source/blender/gpu/CMakeLists.txt
View File

@ -34,7 +34,7 @@ set(INC
../makesrna ../makesrna
../../../intern/guardedalloc ../../../intern/guardedalloc
../../../intern/smoke/extern ../../../intern/smoke/extern
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}
) )
set(SRC set(SRC

2
source/blender/makesrna/intern/CMakeLists.txt
View File

@ -222,7 +222,7 @@ blender_include_dirs(
../../../../intern/audaspace/intern ../../../../intern/audaspace/intern
../../../../intern/guardedalloc ../../../../intern/guardedalloc
../../../../intern/memutil ../../../../intern/memutil
${GLEW_INCLUDE_PATH} ${GLEW_INCLUDE_PATH}
) )
add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC}) add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC})

1
source/blender/python/intern/bpy_operator_wrap.c
View File

@ -1,4 +1,3 @@
/* /*
* $Id$ * $Id$
* *

36
source/creator/CMakeLists.txt
View File

@ -191,10 +191,10 @@ if(WITH_PYTHON_MODULE)
set_target_properties( set_target_properties(
blender blender
PROPERTIES PROPERTIES
PREFIX "" PREFIX ""
OUTPUT_NAME bpy OUTPUT_NAME bpy
LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/ LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/
RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/ # only needed on windows RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/ # only needed on windows
) )
if(WIN32) if(WIN32)
@ -202,7 +202,7 @@ if(WITH_PYTHON_MODULE)
set_target_properties( set_target_properties(
blender blender
PROPERTIES PROPERTIES
SUFFIX ".pyd" SUFFIX ".pyd"
) )
endif() endif()
@ -574,19 +574,19 @@ elseif(WIN32)
endif() endif()
endif() endif()
if(NOT CMAKE_CL_64) if(NOT CMAKE_CL_64)
install( install(
FILES FILES
${LIBDIR}/thumbhandler/lib/BlendThumb.dll ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}/
) )
else() else()
install( install(
FILES FILES
${LIBDIR}/thumbhandler/lib/BlendThumb64.dll ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
DESTINATION ${TARGETDIR}/ DESTINATION ${TARGETDIR}/
) )
endif() endif()
elseif(APPLE) elseif(APPLE)
set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app) set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
@ -811,13 +811,13 @@ endif()
bf_intern_mikktspace bf_intern_mikktspace
) )
if(WITH_MOD_CLOTH_ELTOPO) if(WITH_MOD_CLOTH_ELTOPO)
list(APPEND BLENDER_SORTED_LIBS extern_eltopo) list(APPEND BLENDER_SORTED_LIBS extern_eltopo)
endif() endif()
if(WITH_BUILTIN_GLEW) if(WITH_BUILTIN_GLEW)
list(APPEND BLENDER_SORTED_LIBS extern_glew) list(APPEND BLENDER_SORTED_LIBS extern_glew)
endif() endif()
if(WITH_BINRELOC) if(WITH_BINRELOC)
list(APPEND BLENDER_SORTED_LIBS extern_binreloc) list(APPEND BLENDER_SORTED_LIBS extern_binreloc)