diff options
| author | Andre Pang <athp@users.sourceforge.net> | 2004-09-28 15:36:39 +0000 |
|---|---|---|
| committer | Andre Pang <athp@users.sourceforge.net> | 2004-09-28 15:36:39 +0000 |
| commit | 1c59446b7a7b45d9014a5f43524af18bdb1c9341 (patch) | |
| tree | 816d83efb5b400dab4244c48c482a9c4d8dadca5 | |
| parent | fadc00dfaef9800832cdd180eb5921c35a2cc60c (diff) | |
| download | xine-lib-1c59446b7a7b45d9014a5f43524af18bdb1c9341.tar.gz xine-lib-1c59446b7a7b45d9014a5f43524af18bdb1c9341.tar.bz2 | |
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
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/xine-utils/Makefile.am | 4 | ||||
| -rw-r--r-- | src/xine-utils/ppcasm_string.S | 5 |
3 files changed, 5 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index ba0fa278b..8071d2a7c 100644 --- a/configure.ac +++ b/configure.ac @@ -1621,6 +1621,7 @@ case "$host_or_hostalias" in ;; *darwin*) + HOST_OS_DARWIN=1 AC_DEFINE_UNQUOTED(HOST_OS_DARWIN, 1, [Define this if built on Mac OS X/Darwin]) CFLAGS="-O3 -pipe -fomit-frame-pointer $m_wm $m_psb -fexpensive-optimizations $f_si $f_nsa -ffast-math -funroll-loops -finline-functions -no-cpp-precomp -D_INTL_REDIRECT_MACROS $CFLAGS" DEBUG_CFLAGS="-O3 $DEBUG_CFLAGS" @@ -1801,6 +1802,7 @@ case "$host_or_hostalias" in ;; esac +AM_CONDITIONAL(HOST_OS_DARWIN, test x"$HOST_OS_DARWIN" = "x1") AM_CONDITIONAL(HAVE_W32DLL, test x"$enable_w32dll" = "xyes") if test x"$enable_w32dll" = "xyes"; then 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 */ |