some fixes and a hack to get osx with ocio compiled, todo: also add the missing libs
authorJens Verwiebe <info@jensverwiebe.de>
Tue, 3 Jul 2012 19:03:52 +0000 (19:03 +0000)
committerJens Verwiebe <info@jensverwiebe.de>
Tue, 3 Jul 2012 19:03:52 +0000 (19:03 +0000)
build_files/scons/config/darwin-config.py
build_files/scons/tools/Blender.py
source/blender/windowmanager/intern/wm_playanim.c

index 0fbe6d25929b2777375765eb0c4d9af552e6d4c7..44c4ee24d5e7c1ada5342e253a7ab9b196827f7e 100644 (file)
@@ -280,7 +280,7 @@ BF_OIIO_LIBPATH = BF_OIIO + '/lib'
 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
index c5ff0807e7677401e0d4acebabab46560c11c186..3566da34570ed7cac16f8ae9c71b3b76b22ca767 100644 (file)
@@ -587,6 +587,9 @@ def AppIt(target=None, source=None, env=None):
         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)
 
index afe45adac7de8860b2c2d34bd6157e10f737733c..e1b7bf80a31c21c43cc2354731b148ae03f4b7e2 100644 (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;
        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 @@ void playanim(int argc, const char **argv)
        }
 
 #ifdef WITH_QUICKTIME
-#if defined(_WIN32) || defined(__APPLE__)
+#if defined(_WIN32) // || defined(__APPLE__)
        /* Initialize QuickTime */
 #ifndef noErr
 #define noErr 0
@@ -825,7 +828,7 @@ void playanim(int argc, const char **argv)
        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 @@ void playanim(int argc, const char **argv)
                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 */