[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [24189] trunk/blender: Mac / COCOA :

[Damien Plisson]

Revision: 24189
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=24189
Author:   damien78
Date:     2009-10-30 21:20:48 +0100 (Fri, 30 Oct 2009)

Log Message:
-----------
Mac / COCOA : 
- fix 10.4 compile issues

- fix some scons issues & add WITH_BF_COLLADA = False in scons darwin_config.py to allow build waiting for complete Collada Mac implementation

Modified Paths:
--------------
    trunk/blender/config/darwin-config.py
    trunk/blender/intern/ghost/SConscript
    trunk/blender/source/blender/imbuf/intern/imbuf_cocoa.m
    trunk/blender/source/blender/windowmanager/SConscript

Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py	2009-10-30 20:02:56 UTC (rev 24188)
+++ trunk/blender/config/darwin-config.py	2009-10-30 20:20:48 UTC (rev 24189)
@@ -246,6 +246,9 @@
 BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
 BF_OPENGL_LINKFLAGS = ['-framework', 'OpenGL']
 
+#OpenCollada flags
+WITH_BF_COLLADA = False
+
 #############################################################################
 ###################  various compile settings and flags    ##################
 #############################################################################

Modified: trunk/blender/intern/ghost/SConscript
===================================================================
--- trunk/blender/intern/ghost/SConscript	2009-10-30 20:02:56 UTC (rev 24188)
+++ trunk/blender/intern/ghost/SConscript	2009-10-30 20:20:48 UTC (rev 24189)
@@ -10,16 +10,7 @@
 if window_system == 'darwin':
 	sources += env.Glob('intern/*.mm')
 
-#if env['WITH_GHOST_COCOA'] == True:
-#	env.Append(CFLAGS=['-DGHOST_COCOA']) 
-#	env.Append(CXXFLAGS=['-DGHOST_COCOA'])
-#	env.Append(CPPFLAGS=['-DGHOST_COCOA'])
 
-#defs = ''
-#if env['WITH_GHOST_COCOA']:
-#	defs += 'GHOST_COCOA'
-# maybe we need it later
-
 pf = ['GHOST_DisplayManager', 'GHOST_System', 'GHOST_Window']
 
 if window_system in ('linux2', 'openbsd3', 'sunos5', 'freebsd6', 'irix6'):

Modified: trunk/blender/source/blender/imbuf/intern/imbuf_cocoa.m
===================================================================
--- trunk/blender/source/blender/imbuf/intern/imbuf_cocoa.m	2009-10-30 20:02:56 UTC (rev 24188)
+++ trunk/blender/source/blender/imbuf/intern/imbuf_cocoa.m	2009-10-30 20:20:48 UTC (rev 24189)
@@ -29,6 +29,7 @@
  *
  */
 
+#include <stdint.h>
 #include <string.h>
 #import <Cocoa/Cocoa.h>
 
@@ -65,7 +66,7 @@
 struct ImBuf *imb_cocoaLoadImage(unsigned char *mem, int size, int flags)
 {
 	struct ImBuf *ibuf = NULL;
-	uint32 width, height;
+	uint32_t width, height;
 	uchar *rasterRGB = NULL;
 	uchar *rasterRGBA = NULL;
 	uchar *toIBuf = NULL;
@@ -204,7 +205,7 @@
 
 short imb_cocoaSaveImage(struct ImBuf *ibuf, char *name, int flags)
 {
-	uint16 samplesperpixel, bitspersample;
+	uint16_t samplesperpixel, bitspersample;
 	unsigned char *from = NULL, *to = NULL;
 	unsigned short *to16 = NULL;
 	float *fromf = NULL;
@@ -224,7 +225,7 @@
 	/* check for a valid number of bytes per pixel.  Like the PNG writer,
 	 * the TIFF writer supports 1, 3 or 4 bytes per pixel, corresponding
 	 * to gray, RGB, RGBA respectively. */
-	samplesperpixel = (uint16)((ibuf->depth + 7) >> 3);
+	samplesperpixel = (uint16_t)((ibuf->depth + 7) >> 3);
 	switch (samplesperpixel) {
 		case 4: /*RGBA type*/
 			hasAlpha = YES;

Modified: trunk/blender/source/blender/windowmanager/SConscript
===================================================================
--- trunk/blender/source/blender/windowmanager/SConscript	2009-10-30 20:02:56 UTC (rev 24188)
+++ trunk/blender/source/blender/windowmanager/SConscript	2009-10-30 20:20:48 UTC (rev 24189)
@@ -29,4 +29,7 @@
 if env['OURPLATFORM'] in ('win32-vc', 'win32-mingw', 'linuxcross', 'win64-vc'):
 	incs += ' ' + env['BF_PTHREADS_INC']
 
+if env['WITH_GHOST_COCOA']:
+	sources.remove('intern/wm_apple.c')
+
 env.BlenderLib ( 'bf_windowmanager', sources, Split(incs), defs, libtype=['core'], priority=[5] )