[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [61130] trunk/blender/source/blender/ windowmanager: OSX: remove obsolete file and adapt scons

[jens verwiebe]

Revision: 61130
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=61130
Author:   jensverwiebe
Date:     2013-11-05 14:02:33 +0000 (Tue, 05 Nov 2013)
Log Message:
-----------
OSX: remove obsolete file and adapt scons

Modified Paths:
--------------
    trunk/blender/source/blender/windowmanager/SConscript

Removed Paths:
-------------
    trunk/blender/source/blender/windowmanager/intern/wm_apple.c

Modified: trunk/blender/source/blender/windowmanager/SConscript
===================================================================
--- trunk/blender/source/blender/windowmanager/SConscript	2013-11-05 13:50:53 UTC (rev 61129)
+++ trunk/blender/source/blender/windowmanager/SConscript	2013-11-05 14:02:33 UTC (rev 61130)
@@ -66,9 +66,6 @@
     incs += ' ' + env['BF_PTHREADS_INC']
     incs += ' ../../intern/utfconv'
 
-if env['OURPLATFORM'] != 'darwin' or env['WITH_GHOST_COCOA']:
-    sources.remove('intern' + os.sep + 'wm_apple.c')
-
 if env['BF_BUILDINFO']:
     defs.append('WITH_BUILDINFO')
 

Deleted: trunk/blender/source/blender/windowmanager/intern/wm_apple.c
===================================================================
--- trunk/blender/source/blender/windowmanager/intern/wm_apple.c	2013-11-05 13:50:53 UTC (rev 61129)
+++ trunk/blender/source/blender/windowmanager/intern/wm_apple.c	2013-11-05 14:02:33 UTC (rev 61130)
@@ -1,137 +0,0 @@
-/*
- * ***** BEGIN GPL LICENSE BLOCK *****
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version. 
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software Foundation,
- * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- *
- * The Original Code is Copyright (C) 2007 Blender Foundation.
- * All rights reserved.
- *
- * 
- * Contributor(s): Blender Foundation
- *
- * ***** END GPL LICENSE BLOCK *****
- */
-
-/** \file blender/windowmanager/intern/wm_apple.c
- *  \ingroup wm
- */
-
-/* note, this file builds on apple-carbon only! */
-
-#include "BKE_context.h"
-#include "BKE_global.h"
-#include "WM_api.h"
-
-#include <OpenGL/OpenGL.h>
-#define __CARBONSOUND__
-/* XXX BIG WARNING: carbon.h can not be included in blender code, it conflicts with struct ID */
-#define ID ID_
-#include <Carbon/Carbon.h>
-
-/* To avoid killing small end comps, we want to allow
- * blender to start maximized if all the followings are true :
- * - Renderer is OpenGL capable
- * - Hardware acceleration
- * - VRAM > 16 Mo
- *
- * We will bail out if VRAM is less than 8Mo
- */
-
-/* bad global, used in wm_window.c to open windows */
-int macPrefState = 0;
-
-static int checkAppleVideoCard(void) 
-{
-	CGLRendererInfoObj rend;
-	long theErr;
-	unsigned long display_mask;
-	long nrend;
-	int j;
-	long value;
-	long maxvram = 0;   /* we get always more than 1 renderer, check one, at least, has 8 Mo */
-	
-	display_mask = CGDisplayIDToOpenGLDisplayMask(CGMainDisplayID() );
-	
-	theErr = CGLQueryRendererInfo(display_mask, &rend, &nrend);
-	if (theErr == 0) {
-		theErr = CGLDescribeRenderer(rend, 0, kCGLRPRendererCount, &nrend);
-		if (theErr == 0) {
-			for (j = 0; j < nrend; j++) {
-				theErr = CGLDescribeRenderer(rend, j, kCGLRPVideoMemory, &value);
-				if (value > maxvram)
-					maxvram = value;
-				if ((theErr == 0) && (value >= 20000000)) {
-					theErr = CGLDescribeRenderer(rend, j, kCGLRPAccelerated, &value);
-					if ((theErr == 0) && (value != 0)) {
-						theErr = CGLDescribeRenderer(rend, j, kCGLRPCompliant, &value);
-						if ((theErr == 0) && (value != 0)) {
-							/*fprintf(stderr, "make it big\n");*/
-							CGLDestroyRendererInfo(rend);
-							macPrefState = 8;
-							return 1;
-						}
-					}
-				}
-			}
-		}
-	}
-	if (maxvram < 7500000) {        /* put a standard alert and quit*/
-		SInt16 junkHit;
-		char inError[] = "* Not enough VRAM    ";
-		char inText[] = "* blender needs at least 8Mb    ";
-		inError[0] = 16;
-		inText[0] = 28;
-		
-		fprintf(stderr, " vram is %li . not enough, aborting\n", maxvram);
-		StandardAlert(kAlertStopAlert, (ConstStr255Param) & inError, (ConstStr255Param) & inText, NULL, &junkHit);
-		abort();
-	}
-	CGLDestroyRendererInfo(rend);
-	return 0;
-}
-
-static void getMacAvailableBounds(short *top, short *left, short *bottom, short *right) 
-{
-	Rect outAvailableRect;
-	
-	GetAvailableWindowPositioningBounds(GetMainDevice(), &outAvailableRect);
-	
-	*top = outAvailableRect.top;  
-	*left = outAvailableRect.left;
-	*bottom = outAvailableRect.bottom; 
-	*right = outAvailableRect.right;
-}
-
-
-void wm_set_apple_prefsize(int scr_x, int scr_y)
-{
-	
-	/* first let us check if we are hardware accelerated and with VRAM > 16 Mo */
-	
-	if (checkAppleVideoCard()) {
-		short top, left, bottom, right;
-		
-		getMacAvailableBounds(&top, &left, &bottom, &right);
-		WM_init_state_size_set(left + 10, scr_y - bottom + 10, right - left - 20, bottom - 64);
-		G.windowstate = 0;
-		
-	}
-	else {
-		
-		/* 40 + 684 + (headers) 22 + 22 = 768, the powerbook screen height */
-		WM_init_state_size_set(120, 40, 850, 684);
-		G.windowstate = 0;
-	}
-}