forked from bartvdbraak/blender
minor cleanup, no functional changes.
This commit is contained in:
parent
18e9d9c3e2
commit
1e0c3d315b
@ -870,7 +870,7 @@ elseif(APPLE)
|
||||
set(GETTEXT_LIB intl iconv)
|
||||
set(GETTEXT_LIBPATH ${GETTEXT}/lib)
|
||||
endif()
|
||||
|
||||
|
||||
if(WITH_FFTW3)
|
||||
set(FFTW3 ${LIBDIR}/fftw3)
|
||||
set(FFTW3_INC ${FFTW3}/include)
|
||||
|
@ -29,7 +29,7 @@ set(INC
|
||||
../string
|
||||
../../source/blender/imbuf
|
||||
../../source/blender/makesdna
|
||||
${GLEW_INCLUDE_PATH}
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
|
@ -123,6 +123,5 @@ if(WITH_PYTHON)
|
||||
endif()
|
||||
|
||||
if(WITH_OPENCOLLADA)
|
||||
add_subdirectory(collada)
|
||||
add_subdirectory(collada)
|
||||
endif()
|
||||
|
||||
|
@ -29,7 +29,7 @@ set(INC
|
||||
../editors/include
|
||||
../blenkernel
|
||||
../../../intern/guardedalloc
|
||||
${GLEW_INCLUDE_PATH}
|
||||
${GLEW_INCLUDE_PATH}
|
||||
${FREETYPE_INCLUDE_DIRS}
|
||||
)
|
||||
|
||||
|
@ -53,7 +53,7 @@ set(INC
|
||||
../../../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 @@ if(WITH_LZMA)
|
||||
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}")
|
||||
|
@ -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) */
|
||||
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 */
|
||||
|
||||
|
@ -32,7 +32,7 @@ set(INC
|
||||
../../render/extern/include
|
||||
../../windowmanager
|
||||
../../../../intern/guardedalloc
|
||||
${GLEW_INCLUDE_PATH}
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
|
@ -34,7 +34,7 @@ set(INC
|
||||
../makesrna
|
||||
../../../intern/guardedalloc
|
||||
../../../intern/smoke/extern
|
||||
${GLEW_INCLUDE_PATH}
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
set(SRC
|
||||
|
@ -222,7 +222,7 @@ blender_include_dirs(
|
||||
../../../../intern/audaspace/intern
|
||||
../../../../intern/guardedalloc
|
||||
../../../../intern/memutil
|
||||
${GLEW_INCLUDE_PATH}
|
||||
${GLEW_INCLUDE_PATH}
|
||||
)
|
||||
|
||||
add_executable(makesrna ${SRC} ${SRC_RNA_INC} ${SRC_DNA_INC})
|
||||
|
@ -1,4 +1,3 @@
|
||||
|
||||
/*
|
||||
* $Id$
|
||||
*
|
||||
|
@ -191,10 +191,10 @@ if(WITH_PYTHON_MODULE)
|
||||
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 @@ if(WITH_PYTHON_MODULE)
|
||||
set_target_properties(
|
||||
blender
|
||||
PROPERTIES
|
||||
SUFFIX ".pyd"
|
||||
SUFFIX ".pyd"
|
||||
)
|
||||
endif()
|
||||
|
||||
@ -574,19 +574,19 @@ elseif(WIN32)
|
||||
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 @@ endif()
|
||||
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)
|
||||
|
Loading…
Reference in New Issue
Block a user