[MPlayer-cvslog] CVS: main asmalign.h, NONE, 1.1 configure, 1.1159, 1.1160 mangle.h, 1.6, 1.7

[Nicolas Plourde CVS]

CVS change done by Nicolas Plourde CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv17711

Modified Files:
	configure mangle.h 
Added Files:
	asmalign.h 
Log Message:
add support for intel mac. mp3lib is not fixed yet.

--- NEW FILE ---
#ifdef SYS_DARWIN
#define ASMALIGN8  ".align 3\n\t"
#define ASMALIGN16 ".align 4\n\t"
#else
#define ASMALIGN8  ".balign 8\n\t"
#define ASMALIGN16 ".balign 16\n\t"
#endif

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1159
retrieving revision 1.1160
diff -u -r1.1159 -r1.1160
--- configure	4 Apr 2006 05:09:12 -0000	1.1159
+++ configure	15 Apr 2006 20:46:53 -0000	1.1160
@@ -6972,7 +6972,10 @@
 echores "$_crash_debug"
 
 if darwin ; then
-  CFLAGS="$CFLAGS -mdynamic-no-pic -falign-loops=16 -DSYS_DARWIN"
+  CFLAGS="$CFLAGS -mdynamic-no-pic -falign-loops=16 -DSYS_DARWIN -DCONFIG_DARWIN"  
+  if x86 ; then
+  CFLAGS="$CFLAGS -arch i386 -isysroot /Developer/SDKs/MacOSX10.4u.sdk"
+  fi
   if [ "$_cc_major" = 3 ] && [ "$_cc_minor" -lt 1 ]; then
     CFLAGS="$CFLAGS -no-cpp-precomp"
   fi

Index: mangle.h
===================================================================
RCS file: /cvsroot/mplayer/main/mangle.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- mangle.h	30 Mar 2003 20:11:05 -0000	1.6
+++ mangle.h	15 Apr 2006 20:46:53 -0000	1.7
@@ -9,7 +9,7 @@
 
 /* Feel free to add more to the list, eg. a.out IMO */
 #if defined(__CYGWIN__) || defined(__MINGW32__) || defined(__OS2__) || \
-   (defined(__OpenBSD__) && !defined(__ELF__))
+   (defined(__OpenBSD__) && !defined(__ELF__)) || defined(__APPLE__)
 #define MANGLE(a) "_" #a
 #else
 #define MANGLE(a) #a