Commit Graph

50 Commits

Author SHA1 Message Date
Jens Verwiebe
f6f9288f35 replace former applescript with an editable one 2011-10-19 19:15:35 +00:00
Jens Verwiebe
c661a4b1ab OSX: set at least initial OMP_NUM_THREADS value to avoid warnings in log, remove applescript for now 2011-10-19 19:12:41 +00:00
Jens Verwiebe
3335cf41f6 OSX: omp script rework part2 2011-10-17 10:43:32 +00:00
Jens Verwiebe
70abd2a304 OSX: omp script rework part1 2011-10-17 10:41:47 +00:00
Jens Verwiebe
9a5921883e OSX: Start with OMP_NUM_THREADS default unchanged, to let the user decide about optimized value, default == all cores used 2011-10-17 10:30:08 +00:00
Jens Verwiebe
1c8a91d4df OSX: add editable applescript to not have the script a blackbox 2011-10-15 14:21:03 +00:00
Jens Verwiebe
08f8fbbd30 OSX:recommit applescript, added errorhandling 2011-10-15 14:04:33 +00:00
Jens Verwiebe
843193e4d1 Delete applescript for recommit 2011-10-15 14:03:23 +00:00
Jens Verwiebe
e7b0ccbb0b OSX:recommit applescript, fixed an issue 2011-10-14 20:12:34 +00:00
Jens Verwiebe
c963edeb9e Delete applescript for recommit 2011-10-14 20:11:19 +00:00
Jens Verwiebe
e7095450e7 OSX: commit the omp_set_simulation_threads applescript and copy-routines 2011-10-14 17:54:37 +00:00
Jens Verwiebe
afcf581fb0 OSX: commit the needed steps for compiling with gcc 4.6.1 and OMP_NUM_THREADS env variable setting 2011-10-14 17:27:55 +00:00
Campbell Barton
4c71d9efb5 set svn end of lines to native 2011-05-09 08:15:38 +00:00
Brecht Van Lommel
bcee2343ea 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.
2011-03-16 15:44:17 +00:00
Campbell Barton
89c617a116 remove nan-makefiles 2011-01-30 15:29:22 +00:00
Stefan Gartner
8ce2c26da3 darwin Makefiles: copy release scripts and python modules to where blender looks for them,
i.e. blender.app/Content/MacOS/$(VERSION) instead if blender.app/Content/MacOS/.blender
2010-10-14 19:30:55 +00:00
Guillermo S. Romero
95aa8cfa4a Update address in license block. 2010-08-10 21:22:26 +00:00
Brecht Van Lommel
c1fd3ae7a0 Fix make/darwin build, was not updated for moved bin/ directory. 2010-07-29 13:04:20 +00:00
Campbell Barton
bed40ed8e3 move directories:
dlltool --> build_files/make/dlltool
 bin --> release/bin
 
Since dlltool is only used make + mingw and ./bin is misleading because it would seem the blender binary would be copied there, but its just used for home directory files.

updated scons/cmake/make
2010-07-26 11:47:33 +00:00
Stefan Gartner
1f33d574c2 OS X Makefiles:
* added some new variables (mostly the same as with scons):
  - USE_COCOA: use Cocoa for ghost (defaults to true)
  - MACOSX_ARCHITECTURE: can be ppc, ppc64, i386, x86_64. By default this is the host architecture
    (ppc for PowerPC Macs, i386 for Intel Macs). In theory this allows to cross compile blender for
    a different architecture, though cross compilation only works on Intel Macs, because makesdna
    and makesrna are built for the target architecture.
    For a 64 bit build, set MACOSX_ARCHITECTURE to x86_64 (Intel) or ppc64 (PowerPC).
  - MACOSX_MIN_VERS: minimum OS X version to run blender on (10.4 for 32 bit builds, 10.5 for 64 bit    builds)
  - MACOSX_DEPLOYMENT_TARGET: needed by the linker to create an Application targeted for a specific
    OS version (defaults to 10.4 for 32 bit builds, 10.5 for 64 bit builds)
  - MACOSX_SDK: path to a specific SDK. currently not used 
  - USE_QTKIT: use QTKit instead of QuickTime (defaults to true for 64 bit builds, as using QTKit
    is mandatory in that case))
 * use the same compiler flags as scons
 * default compiler now is gcc-4.0 when building for 10.4 and gcc-4.2 when building for 10.5
 * extract $(LCGDIR)/release/python_$(MACOSX_ARCHITECTURE).zip to Application bundle. This might
   break building on 10.4, to fix that, rename $(LCGDIR)/release/python.zip 

When compiling blender, only MACOSX_ARCHITECTURE might be of interest, as it allows doing 64 bit
builds (or 32 bit PowerPC builds on Intel). All other variables are then set to reasonable defaults.
For current users of the Makefile system, this commit shouldn't change much.
2010-01-03 20:35:13 +00:00
Campbell Barton
2d797f35d8 - removed 2.4x release/scripts
- moved release/io and release/ui into release/scripts/io, ui
- updated scons, cmake, make

When porting 2.4x scripts back, use a command like this so as not to loose the commit history...
 
 svn cp https://svn.blender.org/svnroot/bf-blender/branches/blender2.4/release/scripts/raw_import.py release/scripts/io/import_raw.py
2009-09-28 03:19:52 +00:00
Matt Ebb
a0e252c25f NaN makefiles now support and build with precompiled Python 3.1 by default on Mac 2009-08-02 06:22:53 +00:00
Matt Ebb
65143c50e0 * Updated the Mac OS X blender and .blend file icons to support
the new (in 10.5) 512px icon standard.

Thanks to Samo 'xype' Korosec for the original graphic treatment!

http://mke3.net/blender/devel/2.5/hugeicon.jpg
2009-05-21 13:39:47 +00:00
Ton Roosendaal
5eb4d89cec 2.5
Make: removing hidden directories from .app failed.
2009-04-23 09:59:03 +00:00
Brecht Van Lommel
874c29cea8 2.50: svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r19323:HEAD
Notes:
* blenderbuttons and ICON_SNAP_PEEL_OBJECT were not merged.
2009-04-20 15:06:46 +00:00
Ton Roosendaal
bf2ccf04a7 2.5
Makefile update for osx: copy ui scripts to .blender dir in .app folder
2009-04-13 14:22:22 +00:00
Chris Want
5d0a207ecb Patch from GSR that a) fixes a whole bunch of GPL/BL license
blocks that were previously missed; and b) greatly increase my
ohloh stats!
2008-04-16 22:40:48 +00:00
Chris Want
5e3cffc64a Patch to change license to GPL only, from GSR. 2008-01-07 19:13:47 +00:00
Ton Roosendaal
c33a8b65c0 Totally ancient error: Makefiles for OSX did not copy the scripts in
the right way for regular builds... only the 'make release' did it OK.
2006-07-01 09:40:13 +00:00
Matt Ebb
5b7398ce53 Updated Mac OS X icons courtesy of Erik Mendoza, re. this thread on blender.org:
http://www.blender.org/forum/viewtopic.php?t=8121
2006-02-13 21:08:43 +00:00
Willian Padovani Germano
fa5d910f93 Updating build systems: folder release/bpydata/ moved to release/scripts/bpydata/
It seemed trivial enough, so I updated all systems (makefiles, xcode, scons, scons win installer), please complain if something went wrong.  Mostly it was just removing release/bpydata references, since the release/scripts dir is already worked on recursevely, handling dirs inside it.

For the scons nsi file writer script I had to write code for each new dir, but it can be recoded recursively, too (in fact joining all release stuff in a single dir tree with nothing else would be a good idea, making installation code simpler).  Since it's just python and I have a little more time now, I can help scons managers if they still need.

Thanks Campbell Barton for reporting.
2005-04-16 18:25:42 +00:00
Jean-Luc Peurière
c78e44cdc5 big warning hunt commit
lot of casts, added prototypes, missing includes and some true errors
2005-03-09 19:45:59 +00:00
Ton Roosendaal
4226715fc0 Update make system for darwin;
- using python framework (default on, set it off with define in
  definitions.mk)
- not installing .bfont.tff
2004-11-14 13:44:47 +00:00
Ton Roosendaal
de1147e99a Removed nantechnologies from identifierstring :) 2004-09-28 20:59:14 +00:00
Ton Roosendaal
8f4f2e5235 Correct icons for OSX 2004-04-28 21:19:18 +00:00
Daniel Dunbar
f157940432 - convert darwin icon files to binary 2004-04-24 18:34:08 +00:00
Matt Ebb
2cac5e0dda Updated the Mac OS X blender file icon with standard background and xype's nice shiney blender logo 2003-12-19 12:07:24 +00:00
Ton Roosendaal
85d043ffef - slightly improved icons, again by xype. Now they are less ... er ..
shady!
2003-07-21 18:25:50 +00:00
Stefan Gartner
c5d8d5ffe2 new os x icons by xype 2003-07-20 13:38:51 +00:00
Stefan Gartner
a502c1721f use $(NANBLENDERHOME) instead of ../.. 2003-05-13 22:00:44 +00:00
Stefan Gartner
d362a1191e updated blender icon for os x 2003-05-13 13:50:24 +00:00
Stefan Gartner
eca049b177 store locales, .Blanguage, and .bfont.ttf inside of Resources folder of
application bundle on OS X
2003-05-12 18:12:25 +00:00
Stefan Gartner
99bd02a98b store message catalogs in Resources folder of the application bundle on OS
X. Opening a file selector is no longer needed in order to switch the
language for the first time; apparently gettext wasn't too happy about
relative paths.
2003-05-09 20:20:40 +00:00
Stefan Gartner
ce9b430639 fill in correct values for VERSION and DATE when building the
application bundles
2003-02-09 18:32:55 +00:00
Stefan Gartner
f80ef114be updated copyright notice 2003-02-09 18:22:45 +00:00
Stefan Gartner
2ad6ec0a41 replace "blenderpublisher" with "blender" 2003-02-02 17:53:41 +00:00
Stefan Gartner
5146bc6e41 build the OSX application bundle in $(DIR)/bin 2003-02-02 17:28:15 +00:00
Kent Mein
5b88406c3f I moved source/darwin/blenderpublisher.app to source/darwin/blender.app
or at least tried.
You will probably want to rm -rf source/darwin/blenderpublisher.app

Kent
--
mein@cs.umn.edu
2002-12-03 10:02:40 +00:00
Maarten Gribnau
08b13d90f5 added a line to add executable attributes to the binaries when copying into the
Mac bundles
Maarten (mail@maartengribnau.com)
2002-11-03 22:38:32 +00:00
Hans Lambermont
12315f4d0e Initial revision 2002-10-12 11:37:38 +00:00