Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merged changes in the trunk up to revision 33894.

Browse Source 
A note for branch users: CMake 2.8 on 64-bit Windows Vista raised
an error in line 948 of soc-2008-mxcurioni/CMakeLists.txt due to
an invalid argument for the blender_include_dirs macro:

  blender_include_dirs(${OPENGL_INCLUDE_DIR})

The command above should be:

  blender_include_dirs("${OPENGL_INCLUDE_DIR}")
This commit is contained in:
Tamito Kajiyama
2010-12-27 01:38:23 +00:00
parent 2d1bc90eed c4a56fda6d
commit 3ead3c4ff3
342 changed files with 3965 additions and 3549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
source/creator/CMakeLists.txt
View File

@@ -1,3 +1,4 @@
# -*- mode: cmake; indent-tabs-mode: t; -*-
# $Id$
# ***** BEGIN GPL LICENSE BLOCK *****
#
@@ -29,7 +30,7 @@ cmake_policy(SET CMP0005 NEW)
setup_libdirs()
include_directories(
blender_include_dirs(
../../intern/guardedalloc
../blender/blenlib
../blender/blenkernel
@@ -68,12 +69,12 @@ if(WITH_IMAGE_HDR)
endif()
if(WITH_PYTHON)
include_directories(../blender/python)
blender_include_dirs(../blender/python)
add_definitions(-DWITH_PYTHON)
endif()
if(WITH_GAMEENGINE)
include_directories(
blender_include_dirs(
../kernel/gen_messaging
../kernel/gen_system
)
@@ -87,7 +88,7 @@ endif()
if(CMAKE_SYSTEM_NAME MATCHES "Linux")
add_definitions(-DWITH_BINRELOC)
include_directories(${BINRELOC_INC})
blender_include_dirs(${BINRELOC_INC})
endif()
# Setup the exe sources and buildinfo
@@ -314,8 +315,8 @@ if(WITH_INSTALL)
COMMAND if \"$(ConfigurationName)\" == \"\" xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
COMMAND if \"$(ConfigurationName)\" == \"Debug\" copy /Y \"${LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
COMMAND if \"$(ConfigurationName)\" == \"Debug\" xcopy /E /Y \"${LIBDIR}\\release\\python31_d\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
COMMAND if \"$(ConfigurationName)\" == \"RelWithDebInfo\" copy /Y \"${LIBDIR}\\python\\lib\\python31_d.dll\" \"${TARGETDIR}\\\"
COMMAND if \"$(ConfigurationName)\" == \"RelWithDebInfo\" xcopy /E /Y \"${LIBDIR}\\release\\python31_d\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
COMMAND if \"$(ConfigurationName)\" == \"RelWithDebInfo\" copy /Y \"${LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
COMMAND if \"$(ConfigurationName)\" == \"RelWithDebInfo\" xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
COMMAND if \"$(ConfigurationName)\" == \"Release\" copy /Y \"${LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"
COMMAND if \"$(ConfigurationName)\" == \"Release\" xcopy /E /Y \"${LIBDIR}\\release\\python31\\*.*\" \"${TARGETDIR}\\${BLENDER_VERSION}\\python\\lib\\\"
COMMAND if \"$(ConfigurationName)\" == \"MinSizeRel\" copy /Y \"${LIBDIR}\\python\\lib\\python31.dll\" \"${TARGETDIR}\\\"