From 1c59446b7a7b45d9014a5f43524af18bdb1c9341 Mon Sep 17 00:00:00 2001 From: Andre Pang Date: Tue, 28 Sep 2004 15:36:39 +0000 Subject: Turn #if condition in ppcasm_string.S to an AM_CONDITIONAL: fixes compilation on Mac OS X. Thanks to kfish for the suggestion. CVS patchset: 7005 CVS date: 2004/09/28 15:36:39 --- src/xine-utils/Makefile.am | 4 +++- src/xine-utils/ppcasm_string.S | 5 ----- 2 files changed, 3 insertions(+), 6 deletions(-) (limited to 'src') diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am index 27d7a5b60..e0a35cb1f 100644 --- a/src/xine-utils/Makefile.am +++ b/src/xine-utils/Makefile.am @@ -6,7 +6,9 @@ noinst_LTLIBRARIES = libxineutils.la EXTRA_DIST = ppcasm_string.S ppc_asm.tmpl if PPC_ARCH -pppc_files = ppcasm_string.S +if !HOST_OS_DARWIN +pppc_files = ppcasm_string.S +endif endif AM_CFLAGS = $(X_CFLAGS) diff --git a/src/xine-utils/ppcasm_string.S b/src/xine-utils/ppcasm_string.S index b1645bbe7..419a5d7d2 100644 --- a/src/xine-utils/ppcasm_string.S +++ b/src/xine-utils/ppcasm_string.S @@ -12,10 +12,6 @@ * 2 of the License, or (at your option) any later version. */ -#include "../../config.h" - -#if defined (ARCH_PPC) && !defined (HOST_OS_DARWIN) - //#warning Be forewarned - using PowerPC assembly #include "ppc_asm.tmpl" @@ -179,4 +175,3 @@ _GLOBFN(ppcasm_memcpy) _SIZE(ppcasm_memcpy) -#endif /* ARCH_PPC */ -- cgit v1.2.3