[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [14580] trunk/blender: follow-up for the universal darwin config.py

[JLuc Peuriere]

Revision: 14580
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=14580
Author:   lukep
Date:     2008-04-28 00:05:53 +0200 (Mon, 28 Apr 2008)

Log Message:
-----------
follow-up for the universal darwin config.py


also added bal level call stub for set_last_seq,
player building was broken by recent commit

Modified Paths:
--------------
    trunk/blender/config/darwin-config.py
    trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c

Modified: trunk/blender/config/darwin-config.py
===================================================================
--- trunk/blender/config/darwin-config.py	2008-04-27 22:04:47 UTC (rev 14579)
+++ trunk/blender/config/darwin-config.py	2008-04-27 22:05:53 UTC (rev 14580)
@@ -74,7 +74,11 @@
 BF_QUIET = '1'
 WITH_BF_OPENMP = '0'
 
-WITH_BF_OPENAL = 'true'
+# Note : should be true, but openal simply dont work on intel
+if MAC_PROC == 'i386':
+	WITH_BF_OPENAL = 'false'
+else:
+	WITH_BF_OPENAL = 'true'
 #different lib must be used  following version of gcc
 # for gcc 3.3
 #BF_OPENAL = LIBDIR + '/openal'
@@ -193,11 +197,11 @@
 BF_OPENGL_LIBPATH = '/System/Library/Frameworks/OpenGL.framework/Libraries'
 BF_OPENGL_LINKFLAGS = '-framework OpenGL'
 
-CFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing']
+CFLAGS = ['-pipe','-fPIC','-funsigned-char']
 
 CPPFLAGS = ['-fpascal-strings']
-CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing', '-fpascal-strings']
-CXXFLAGS = [ '-pipe','-fPIC','-funsigned-char','-fno-strict-aliasing', '-fpascal-strings']
+CCFLAGS = ['-pipe','-fPIC','-funsigned-char','-fpascal-strings']
+CXXFLAGS = [ '-pipe','-fPIC','-funsigned-char', '-fpascal-strings']
 PLATFORM_LINKFLAGS = '-fexceptions -framework CoreServices -framework Foundation -framework IOKit -framework AppKit -framework Carbon -framework AGL -framework AudioUnit -framework AudioToolbox -framework CoreAudio -framework QuickTime'
 
 #note to build succesfully on 10.3.9 SDK you need to patch  10.3.9 by adding the SystemStubs.a lib from 10.4
@@ -220,6 +224,10 @@
 	REL_CFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3']
 	REL_CCFLAGS = ['-O2','-ftree-vectorize','-msse','-msse2','-msse3','-mssse3']
 else:
+	CFLAGS = CFLAGS+['-fno-strict-aliasing']
+	CCFLAGS =  CCFLAGS+['-fno-strict-aliasing']
+	CXXFLAGS = CXXFLAGS+['-fno-strict-aliasing']
+	
 	REL_CFLAGS = ['-O2']
 	REL_CCFLAGS = ['-O2']
 

Modified: trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c
===================================================================
--- trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c	2008-04-27 22:04:47 UTC (rev 14579)
+++ trunk/blender/source/blender/blenkernel/bad_level_call_stubs/stubs.c	2008-04-27 22:05:53 UTC (rev 14580)
@@ -355,6 +355,7 @@
 
 /* editseq.c */
 Sequence *get_forground_frame_seq(int frame){return 0;};
+void set_last_seq(Sequence *seq){return 0;};
 
 /* modifier.c stub */
 void harmonic_coordinates_bind(struct MeshDeformModifierData *mmd,