Quick compile fix for OS X / Intel

 Optimizations are disabled at the moment. In order to get them to
 work, we'd need either nasm to be able to output Mach-O object files,
 or we should convert the assembly code to something OS X can handle,
 like gas.

git-svn-id: svn://svn.videolan.org/x264/trunk@400 df754926-b1dd-0310-bc7b-ec298dee348c

diff --git a/Makefile b/Makefile
index b026e32d822c78cd1bacd6b014c1b7a79b170032..2e0c2703c81fb6ccd4f818029366072081c5a47a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -15,6 +15,9 @@ ifeq ($(VIS),yes)
 SRCS   += common/visualize.c common/display-x11.c
 endif
 
+# No optims on OS X / Intel yet because of nasm limitations
+ifneq ($(SYS),MACOSX)
+
 # MMX/SSE optims
 ifeq ($(ARCH),X86)
 SRCS   += common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
@@ -38,6 +41,8 @@ OBJASM  = $(ASMSRC:%.asm=%.o)
 ASFLAGS += -Icommon/amd64
 endif
 
+endif # SYS_MACOSX
+
 # AltiVec optims
 ifeq ($(ARCH),PPC)
 SRCS += common/ppc/mc.c common/ppc/pixel.c common/ppc/dct.c

diff --git a/common/cpu.c b/common/cpu.c
index 7a8bc4fe17f71f2384f0f930358049323916d018..94b68c5d84ef55c32fcc77ac81bcffa78ea59a0c 100644 (file)
--- a/common/cpu.c
+++ b/common/cpu.c
@@ -33,6 +33,12 @@
 #include "x264.h"
 #include "cpu.h"
 
+/* XXX
+   No nasm on OS X / Intel yet */
+#if defined(ARCH_X86) && defined(SYS_MACOSX)
+#undef ARCH_X86
+#endif
+
 #if defined(ARCH_X86) || defined(ARCH_X86_64)
 extern int  x264_cpu_cpuid_test( void );
 extern uint32_t  x264_cpu_cpuid( uint32_t op, uint32_t *eax, uint32_t *ebx, uint32_t *ecx, uint32_t *edx );

diff --git a/configure b/configure
index 3b696f8d6bc0fe51f68f7b15aafa6811755bb016..0ad97fa290b756a3dc5cec9680465e6b2805bf1f 100755 (executable)
--- a/configure
+++ b/configure
@@ -116,7 +116,11 @@ UNAMEM="`uname -m`"
 case "$UNAMEM" in
   i386|i486|i586|i686|BePC)
     ARCH="X86"
-    CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
+    if [ $SYS != MACOSX ]
+    then
+      # No optims on OS X / Intel yet because of nasm limitations
+      CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
+    fi
     ;;
   x86_64)
     ARCH="X86_64"