# HG changeset patch
# User nenolod@tiamat.local
# Date 1184158513 18000
# Node ID e6c69ef37b7b0e89b1b826f922753a40cefa8736
# Parent  90e843a4a266d0088a828862570bcb57c8e52ed7
More MacOS fixes.

diff -r 90e843a4a266 -r e6c69ef37b7b src/flac/libflac/memory.c
--- a/src/flac/libflac/memory.c	Wed Jul 11 05:49:16 2007 -0500
+++ b/src/flac/libflac/memory.c	Wed Jul 11 07:55:13 2007 -0500
@@ -35,7 +35,11 @@
 
 #include "private/memory.h"
 #include "FLAC/assert.h"
-#include <malloc.h>
+#include <stdlib.h>
+
+#ifdef __DARWIN
+# undef FLAC__ALIGN_MALLOC_DATA
+#endif
 
 void *FLAC__memory_alloc_aligned(size_t bytes, void **aligned_address)
 {
@@ -43,25 +47,9 @@
 
 	FLAC__ASSERT(0 != aligned_address);
 
-#ifdef FLAC__ALIGN_MALLOC_DATA
-	/* align on 32-byte (256-bit) boundary */
-#if 0
-	x = malloc(bytes+31);
-	/* there's got to be a better way to do this right for all archs */
-	if(sizeof(void*) == sizeof(unsigned))
-		*aligned_address = (void*)(((unsigned)x + 31) & -32);
-	else if(sizeof(void*) == sizeof(FLAC__uint64))
-		*aligned_address = (void*)(((FLAC__uint64)x + 31) & (FLAC__uint64)(-((FLAC__int64)32)));
-	else
-		return 0;
-#endif
-	x = memalign(32, bytes);
+	x = malloc(bytes);
 	*aligned_address = x;
 
-#else
-	x = malloc(bytes);
-	*aligned_address = x;
-#endif
 	return x;
 }
 
diff -r 90e843a4a266 -r e6c69ef37b7b src/madplug/Makefile
--- a/src/madplug/Makefile	Wed Jul 11 05:49:16 2007 -0500
+++ b/src/madplug/Makefile	Wed Jul 11 07:55:13 2007 -0500
@@ -19,8 +19,6 @@
 
 CFLAGS   += $(PICFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(ARCH_DEFINES) $(SIMD_CFLAGS) -I../../intl -I../.. -Wall
 
-LDFLAGS += -Wl,-rpath=$(plugindir)
-
-LIBADD = -L$(plugindir) -laudid3tag -lmad $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
+LIBADD = -L/opt/local/lib -L$(plugindir) -laudid3tag -lmad $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 
 include ../../mk/objective.mk