diff options
| author | Joseph Eagar <joeedh@gmail.com> | 2009-11-02 09:33:16 +0300 |
|---|---|---|
| committer | Joseph Eagar <joeedh@gmail.com> | 2009-11-02 09:33:16 +0300 |
| commit | e3a410d224380a82099cfd7e9f47074293df001b (patch) | |
| tree | 7054dac876ffe8cb33cce426696c3b5373842608 /source/creator | |
| parent | 71d2ceb69147aeead0800cb3b66c37fd132e8c48 (diff) | |
shapekeys are now stored as customdata in editmode, so edit operations like subdivide work (mostly) correctly. tesselated faces now store correct normals in more situations. and added more missing files from the last merge, there may be more though.
Diffstat (limited to 'source/creator')
| -rw-r--r-- | source/creator/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | source/creator/SConscript | 2 | ||||
| -rw-r--r-- | source/creator/buildinfo.c | 17 |
3 files changed, 17 insertions, 10 deletions
diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt index 1a91e4cf8f3..5f352e1d67b 100644 --- a/source/creator/CMakeLists.txt +++ b/source/creator/CMakeLists.txt @@ -207,6 +207,7 @@ IF(APPLE) ADD_CUSTOM_COMMAND( TARGET blender POST_BUILD MAIN_DEPENDENCY blender COMMAND find ${TARGETDIR} -name .svn -prune -exec rm -rf {} "\;" + COMMAND find ${TARGETDIR} -name __MACOSX -prune -exec rm -rf {} "\;" ) @@ -325,11 +326,16 @@ IF(WIN32) ENDIF(WITH_INTERNATIONAL) IF(WITH_PYTHON) + IF(WITH_LIBS10.5) + SET(PYTHON_ZIP "python_${CMAKE_OSX_ARCHITECTURES}.zip") + ELSE(WITH_LIBS10.5) + SET(PYTHON_ZIP "python.zip") + ENDIF(WITH_LIBS10.5) ADD_CUSTOM_COMMAND( TARGET blender POST_BUILD MAIN_DEPENDENCY blender COMMAND cp -Rf ${CMAKE_SOURCE_DIR}/release/scripts ${TARGETDIR}/blender.app/Contents/MacOS/.blender/ COMMAND mkdir ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/ - COMMAND unzip -q ${LIBDIR}/release/python.zip -d ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/ + COMMAND unzip -q ${LIBDIR}/release/${PYTHON_ZIP} -d ${TARGETDIR}/blender.app/Contents/MacOS/.blender/python/ COMMAND find ${TARGETDIR}/blender.app -name "*.py?" -prune -exec rm -rf {} "\;" ) ENDIF(WITH_PYTHON) diff --git a/source/creator/SConscript b/source/creator/SConscript index 7b3d1493ed2..6c95f25a0b2 100644 --- a/source/creator/SConscript +++ b/source/creator/SConscript @@ -36,5 +36,7 @@ else: if env['WITH_BF_FHS']: # /usr -> /usr/share/blender/2.5 defs.append('BLENDERPATH=\\"' + os.path.join(env['BF_INSTALLDIR'], 'share', 'blender', env['BF_VERSION']) + '\\"') +if env['BF_BUILDINFO']: + defs.append('BUILD_DATE') env.BlenderLib ( libname = 'bf_creator', sources = Split(sources), includes = Split(incs), defines = defs, libtype='core', priority = 0 ) diff --git a/source/creator/buildinfo.c b/source/creator/buildinfo.c index cef98915d79..db24b50b82d 100644 --- a/source/creator/buildinfo.c +++ b/source/creator/buildinfo.c @@ -31,14 +31,13 @@ #include <config.h> #endif +#define STRINGIFY(x) XSTRINGIFY(x) +#define XSTRINGIFY(x) #x + #ifdef BUILD_DATE -#ifndef WIN32 -const char * build_date=BUILD_DATE; -const char * build_time=BUILD_TIME; -const char * build_rev=BUILD_REV; -const char * build_platform=BUILD_PLATFORM; -const char * build_type=BUILD_TYPE; -#else -#include "winbuildinfo.h" -#endif +const char * build_date=STRINGIFY(BUILD_DATE); +const char * build_time=STRINGIFY(BUILD_TIME); +const char * build_rev=STRINGIFY(BUILD_REV); +const char * build_platform=STRINGIFY(BUILD_PLATFORM); +const char * build_type=STRINGIFY(BUILD_TYPE); #endif |