[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [48557] branches/soc-2011-tomato: some fixes and a hack to get osx with ocio compiled, todo: also add the missing libs
jens verwiebe
info at jensverwiebe.de
Tue Jul 3 21:03:53 CEST 2012
Revision: 48557
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=48557
Author: jensverwiebe
Date: 2012-07-03 19:03:52 +0000 (Tue, 03 Jul 2012)
Log Message:
-----------
some fixes and a hack to get osx with ocio compiled, todo: also add the missing libs
Modified Paths:
--------------
branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
branches/soc-2011-tomato/build_files/scons/tools/Blender.py
branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
Modified: branches/soc-2011-tomato/build_files/scons/config/darwin-config.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2012-07-03 17:20:21 UTC (rev 48556)
+++ branches/soc-2011-tomato/build_files/scons/config/darwin-config.py 2012-07-03 19:03:52 UTC (rev 48557)
@@ -280,7 +280,7 @@
WITH_BF_OCIO = True
BF_OCIO = LIBDIR + '/opencolorio'
BF_OCIO_INC = BF_OCIO + '/include'
-BF_OCIO_LIB = 'OpenColorIO'
+BF_OCIO_LIB = 'OpenColorIO tinyxml yaml-cpp.a'
BF_OCIO_LIBPATH = BF_OCIO + '/lib'
WITH_BF_BOOST = True
Modified: branches/soc-2011-tomato/build_files/scons/tools/Blender.py
===================================================================
--- branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2012-07-03 17:20:21 UTC (rev 48556)
+++ branches/soc-2011-tomato/build_files/scons/tools/Blender.py 2012-07-03 19:03:52 UTC (rev 48557)
@@ -587,6 +587,9 @@
commands.getoutput(cmd)
cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
+ if env['WITH_BF_OCIO']:
+ cmd = 'cp -R %s/release/datafiles/colormanagement %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
+ commands.getoutput(cmd)
cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd)
Modified: branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c
===================================================================
--- branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c 2012-07-03 17:20:21 UTC (rev 48556)
+++ branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_playanim.c 2012-07-03 19:03:52 UTC (rev 48557)
@@ -693,8 +693,11 @@
inital_state = start_maximized ? GHOST_kWindowStateFullScreen : GHOST_kWindowStateNormal;
else
inital_state = start_maximized ? GHOST_kWindowStateMaximized : GHOST_kWindowStateNormal;
-#ifdef __APPLE__
- inital_state += macPrefState;
+#if defined(__APPLE__) && !defined(GHOST_COCOA)
+ {
+ extern int macPrefState; /* creator.c */
+ initial_state += macPrefState;
+ }
#endif
g_window = GHOST_CreateWindow(g_system,
@@ -810,7 +813,7 @@
}
#ifdef WITH_QUICKTIME
-#if defined(_WIN32) || defined(__APPLE__)
+#if defined(_WIN32) // || defined(__APPLE__)
/* Initialize QuickTime */
#ifndef noErr
#define noErr 0
@@ -825,7 +828,7 @@
if (EnterMovies() != noErr)
G.have_quicktime = FALSE;
else
-#endif /* _WIN32 || __APPLE__ */
+#endif /* _WIN32 //|| __APPLE__ */
G.have_quicktime = TRUE;
#endif /* WITH_QUICKTIME */
@@ -1063,14 +1066,14 @@
ps.picture = ps.picture->next;
}
#ifdef WITH_QUICKTIME
-#if defined(_WIN32) || defined(__APPLE__)
+#if defined(_WIN32) // || defined(__APPLE__)
if (G.have_quicktime) {
ExitMovies();
#ifdef _WIN32
TerminateQTML();
#endif /* _WIN32 */
}
-#endif /* _WIN32 || __APPLE__ */
+#endif /* _WIN32 // || __APPLE__ */
#endif /* WITH_QUICKTIME */
/* cleanup */
More information about the Bf-blender-cvs
mailing list