Revision: 36576
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36576
Author: campbellbarton
Date: 2011-05-09 14:41:44 +0000 (Mon, 09 May 2011)
Log Message:
-----------
minor cleanup, no functional changes.
Modified Paths:
--------------
trunk/blender/CMakeLists.txt
trunk/blender/intern/ghost/CMakeLists.txt
trunk/blender/source/blender/CMakeLists.txt
trunk/blender/source/blender/blenfont/CMakeLists.txt
trunk/blender/source/blender/blenkernel/CMakeLists.txt
trunk/blender/source/blender/editors/include/ED_image.h
trunk/blender/source/blender/editors/render/CMakeLists.txt
trunk/blender/source/blender/gpu/CMakeLists.txt
trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
trunk/blender/source/blender/python/intern/bpy_operator_wrap.c
trunk/blender/source/creator/CMakeLists.txt
Modified: trunk/blender/CMakeLists.txt
===================================================================
--- trunk/blender/CMakeLists.txt 2011-05-09 14:32:55 UTC (rev 36575)
+++ trunk/blender/CMakeLists.txt 2011-05-09 14:41:44 UTC (rev 36576)
@@ -870,7 +870,7 @@
set(GETTEXT_LIB intl iconv)
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
endif()
-
+
if(WITH_FFTW3)
set(FFTW3 ${LIBDIR}/fftw3)
set(FFTW3_INC ${FFTW3}/include)
Modified: trunk/blender/intern/ghost/CMakeLists.txt
===================================================================
--- trunk/blender/intern/ghost/CMakeLists.txt 2011-05-09 14:32:55 UTC (rev
36575)
+++ trunk/blender/intern/ghost/CMakeLists.txt 2011-05-09 14:41:44 UTC (rev
36576)
@@ -29,7 +29,7 @@
../string
../../source/blender/imbuf
../../source/blender/makesdna
- ${GLEW_INCLUDE_PATH}
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/CMakeLists.txt 2011-05-09 14:32:55 UTC (rev
36575)
+++ trunk/blender/source/blender/CMakeLists.txt 2011-05-09 14:41:44 UTC (rev
36576)
@@ -123,6 +123,5 @@
endif()
if(WITH_OPENCOLLADA)
- add_subdirectory(collada)
+ add_subdirectory(collada)
endif()
-
Modified: trunk/blender/source/blender/blenfont/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenfont/CMakeLists.txt 2011-05-09
14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/blenfont/CMakeLists.txt 2011-05-09
14:41:44 UTC (rev 36576)
@@ -29,7 +29,7 @@
../editors/include
../blenkernel
../../../intern/guardedalloc
- ${GLEW_INCLUDE_PATH}
+ ${GLEW_INCLUDE_PATH}
${FREETYPE_INCLUDE_DIRS}
)
Modified: trunk/blender/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-09
14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/blenkernel/CMakeLists.txt 2011-05-09
14:41:44 UTC (rev 36576)
@@ -53,7 +53,7 @@
../../../intern/opennl/extern
../../../intern/smoke/extern
../../../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}
${ZLIB_INCLUDE_DIRS}
)
@@ -314,7 +314,7 @@
endif()
if(MSVC)
- set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
+ set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /WX")
endif()
blender_add_lib(bf_blenkernel "${SRC}" "${INC}")
Modified: trunk/blender/source/blender/editors/include/ED_image.h
===================================================================
--- trunk/blender/source/blender/editors/include/ED_image.h 2011-05-09
14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/editors/include/ED_image.h 2011-05-09
14:41:44 UTC (rev 36576)
@@ -68,8 +68,5 @@
/* UI level image (texture) updating... render calls own stuff (too) */
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 */
Modified: trunk/blender/source/blender/editors/render/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/editors/render/CMakeLists.txt 2011-05-09
14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/editors/render/CMakeLists.txt 2011-05-09
14:41:44 UTC (rev 36576)
@@ -32,7 +32,7 @@
../../render/extern/include
../../windowmanager
../../../../intern/guardedalloc
- ${GLEW_INCLUDE_PATH}
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/gpu/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/gpu/CMakeLists.txt 2011-05-09 14:32:55 UTC
(rev 36575)
+++ trunk/blender/source/blender/gpu/CMakeLists.txt 2011-05-09 14:41:44 UTC
(rev 36576)
@@ -34,7 +34,7 @@
../makesrna
../../../intern/guardedalloc
../../../intern/smoke/extern
- ${GLEW_INCLUDE_PATH}
+ ${GLEW_INCLUDE_PATH}
)
set(SRC
Modified: trunk/blender/source/blender/makesrna/intern/CMakeLists.txt
===================================================================
--- trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-05-09
14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/makesrna/intern/CMakeLists.txt 2011-05-09
14:41:44 UTC (rev 36576)
@@ -222,7 +222,7 @@
../../../../intern/audaspace/intern
../../../../intern/guardedalloc
../../../../intern/memutil
- ${GLEW_INCLUDE_PATH}
+ ${GLEW_INCLUDE_PATH}
)
add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC})
Modified: trunk/blender/source/blender/python/intern/bpy_operator_wrap.c
===================================================================
--- trunk/blender/source/blender/python/intern/bpy_operator_wrap.c
2011-05-09 14:32:55 UTC (rev 36575)
+++ trunk/blender/source/blender/python/intern/bpy_operator_wrap.c
2011-05-09 14:41:44 UTC (rev 36576)
@@ -1,4 +1,3 @@
-
/*
* $Id$
*
Modified: trunk/blender/source/creator/CMakeLists.txt
===================================================================
--- trunk/blender/source/creator/CMakeLists.txt 2011-05-09 14:32:55 UTC (rev
36575)
+++ trunk/blender/source/creator/CMakeLists.txt 2011-05-09 14:41:44 UTC (rev
36576)
@@ -191,10 +191,10 @@
set_target_properties(
blender
PROPERTIES
- PREFIX ""
- OUTPUT_NAME bpy
- LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/
- RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin/ #
only needed on windows
+ PREFIX ""
+ OUTPUT_NAME bpy
+ LIBRARY_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/bin/
+ RUNTIME_OUTPUT_DIRECTORY
${CMAKE_BINARY_DIR}/bin/ # only needed on windows
)
if(WIN32)
@@ -202,7 +202,7 @@
set_target_properties(
blender
PROPERTIES
- SUFFIX ".pyd"
+ SUFFIX ".pyd"
)
endif()
@@ -574,19 +574,19 @@
endif()
endif()
- if(NOT CMAKE_CL_64)
+ if(NOT CMAKE_CL_64)
install(
FILES
- ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
- DESTINATION ${TARGETDIR}/
- )
- else()
+ ${LIBDIR}/thumbhandler/lib/BlendThumb.dll
+ DESTINATION ${TARGETDIR}/
+ )
+ else()
install(
FILES
- ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
- DESTINATION ${TARGETDIR}/
- )
- endif()
+ ${LIBDIR}/thumbhandler/lib/BlendThumb64.dll
+ DESTINATION ${TARGETDIR}/
+ )
+ endif()
elseif(APPLE)
set(SOURCEDIR ${CMAKE_SOURCE_DIR}/source/darwin/blender.app)
@@ -811,13 +811,13 @@
bf_intern_mikktspace
)
- if(WITH_MOD_CLOTH_ELTOPO)
+ if(WITH_MOD_CLOTH_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)
- endif()
+ endif()
if(WITH_BINRELOC)
list(APPEND BLENDER_SORTED_LIBS extern_binreloc)
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
