Mac OS X cmake changes and bundle fixes

For cmake users, you should now use "make install" instead of "make". This was
already changed for Linux and Windows. Same for Xcode, use the install target.

Changes:
* CMake install mechanism, resulting bundle was verified to be indentical here.
* For cmake, include Info.plist in bundle using builtin mechanism for that.
  There was some code in packaging.cmake, but it wasn't correct as these
  properties need to be set on the executable.
* For scons, fix app bundle version, was still using removed release/VERSION.
* Remove unused blendercreator.app and blenderpublisher.app.
* Fix Info.plist being set as a binary file in svn, should be plain text.
This commit is contained in:
Brecht Van Lommel
2011-03-16 15:44:17 +00:00
parent 6e4be608ff
commit bcee2343ea
16 changed files with 127 additions and 182 deletions

View File

@@ -48,14 +48,11 @@ endif
# Get the number of cores for threaded build
NPROCS:=1
DEFAULT_TARGET=install
ifeq ($(OS), Linux)
NPROCS:=$(shell grep -c ^processor /proc/cpuinfo)
endif
ifeq ($(OS), Darwin)
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3)
# make install not support on mac yet
DEFAULT_TARGET=
endif
ifeq ($(OS), FreeBSD)
NPROCS:=$(shell sysctl -a | grep "hw.ncpu " | cut -d" " -f3 )
@@ -78,7 +75,7 @@ all:
@echo
@echo Building Blender ...
cd $(BUILD_DIR) ; make -s -j $(NPROCS) ${DEFAULT_TARGET}
cd $(BUILD_DIR) ; make -s -j $(NPROCS) install
@echo
@echo run blender from "$(BUILD_DIR)/bin/blender"
@echo