sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

some fixes and a hack to get osx with ocio compiled, todo: also add the missing libs

Browse Source
This commit is contained in:
Jens Verwiebe 2012-07-03 19:03:52 +00:00
parent 9ac9040cfd
commit d8f9a2c45f
3 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build_files/scons/config/darwin-config.py
View File

@ -280,7 +280,7 @@ BF_OIIO_LIBPATH = BF_OIIO + '/lib'
WITH_BF_OCIO = True WITH_BF_OCIO = True
BF_OCIO = LIBDIR + '/opencolorio' BF_OCIO = LIBDIR + '/opencolorio'
BF_OCIO_INC = BF_OCIO + '/include' BF_OCIO_INC = BF_OCIO + '/include'
BF_OCIO_LIB = 'OpenColorIO' BF_OCIO_LIB = 'OpenColorIO tinyxml yaml-cpp.a'
BF_OCIO_LIBPATH = BF_OCIO + '/lib' BF_OCIO_LIBPATH = BF_OCIO + '/lib'
WITH_BF_BOOST = True WITH_BF_BOOST = True

3
build_files/scons/tools/Blender.py
View File

@ -587,6 +587,9 @@ def AppIt(target=None, source=None, env=None):
commands.getoutput(cmd) commands.getoutput(cmd)
cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION) cmd = 'cp -R %s/release/datafiles/fonts %s/%s.app/Contents/MacOS/%s/datafiles/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd) 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) cmd = 'cp -R %s/release/scripts %s/%s.app/Contents/MacOS/%s/'%(bldroot,installdir,binary,VERSION)
commands.getoutput(cmd) commands.getoutput(cmd)

15
source/blender/windowmanager/intern/wm_playanim.c
View File

@ -693,8 +693,11 @@ void playanim_window_open(const char *title, int posx, int posy, int sizex, int
inital_state = start_maximized ? GHOST_kWindowStateFullScreen : GHOST_kWindowStateNormal; inital_state = start_maximized ? GHOST_kWindowStateFullScreen : GHOST_kWindowStateNormal;
else else
inital_state = start_maximized ? GHOST_kWindowStateMaximized : GHOST_kWindowStateNormal; inital_state = start_maximized ? GHOST_kWindowStateMaximized : GHOST_kWindowStateNormal;
#ifdef __APPLE__ #if defined(__APPLE__) && !defined(GHOST_COCOA)
inital_state += macPrefState; {
extern int macPrefState; /* creator.c */
initial_state += macPrefState;
}
#endif #endif
g_window = GHOST_CreateWindow(g_system, g_window = GHOST_CreateWindow(g_system,
@ -810,7 +813,7 @@ void playanim(int argc, const char **argv)
} }
#ifdef WITH_QUICKTIME #ifdef WITH_QUICKTIME
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32) // || defined(__APPLE__)
/* Initialize QuickTime */ /* Initialize QuickTime */
#ifndef noErr #ifndef noErr
#define noErr 0 #define noErr 0
@ -825,7 +828,7 @@ void playanim(int argc, const char **argv)
if (EnterMovies() != noErr) if (EnterMovies() != noErr)
G.have_quicktime = FALSE; G.have_quicktime = FALSE;
else else
#endif /* _WIN32 || __APPLE__ */ #endif /* _WIN32 //|| __APPLE__ */
G.have_quicktime = TRUE; G.have_quicktime = TRUE;
#endif /* WITH_QUICKTIME */ #endif /* WITH_QUICKTIME */
@ -1063,14 +1066,14 @@ void playanim(int argc, const char **argv)
ps.picture = ps.picture->next; ps.picture = ps.picture->next;
} }
#ifdef WITH_QUICKTIME #ifdef WITH_QUICKTIME
#if defined(_WIN32) || defined(__APPLE__) #if defined(_WIN32) // || defined(__APPLE__)
if (G.have_quicktime) { if (G.have_quicktime) {
ExitMovies(); ExitMovies();
#ifdef _WIN32 #ifdef _WIN32
TerminateQTML(); TerminateQTML();
#endif /* _WIN32 */ #endif /* _WIN32 */
} }
#endif /* _WIN32 || __APPLE__ */ #endif /* _WIN32 // || __APPLE__ */
#endif /* WITH_QUICKTIME */ #endif /* WITH_QUICKTIME */
/* cleanup */ /* cleanup */