* encoder/ratecontrol.c: OS X support for exp2f and sqrtf.

[x264] / Makefile

diff --git a/Makefile b/Makefile
index 93edb791cc94016ae6a75564c4585648897dbbfc..7580617f268a1be07c432cb99f5d39754b467c45 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -24,6 +24,7 @@ ASMSRC  = common/i386/dct-a.asm common/i386/cpu-a.asm \
           common/i386/pixel-sse2.asm common/i386/quant-a.asm \
           common/i386/deblock-a.asm
 OBJASM  = $(ASMSRC:%.asm=%.o)
+ASFLAGS += -Icommon/i386/
 endif
 
 # MMX/SSE optims
@@ -51,9 +52,6 @@ endif
 
 ifneq ($(HAVE_GETOPT_LONG),1)
 SRCS += extras/getopt.c
-CFLAGS += -DHAVE_GETOPT_LONG=0
-else
-CFLAGS += -DHAVE_GETOPT_LONG=1
 endif
 
 OBJS = $(SRCS:%.c=%.o)
@@ -76,6 +74,7 @@ checkasm: tools/checkasm.o libx264.a
        $(CC) -o $@ $< libx264.a $(LDFLAGS)
 
 common/amd64/*.o: common/amd64/amd64inc.asm
+common/i386/*.o: common/i386/i386inc.asm
 %.o: %.asm
        $(AS) $(ASFLAGS) -o $@ $<
 
@@ -118,7 +117,7 @@ fprofiled:
 endif
 
 clean:
-       rm -f $(OBJS) $(OBJASM) config.h *.a x264.o matroska.o x264 x264.exe .depend TAGS
+       rm -f $(OBJS) $(OBJASM) *.a x264.o matroska.o x264 x264.exe .depend TAGS
        rm -f checkasm checkasm.exe tools/checkasm.o
        rm -f tools/avc2avi tools/avc2avi.exe tools/avc2avi.o
        rm -rf vfw/build/cygwin/bin
@@ -126,7 +125,7 @@ clean:
        - sed -e 's/ *-fprofile-\(generate\|use\)//g' config.mak > config.mak2 && mv config.mak2 config.mak
 
 distclean: clean
-       rm -f config.mak vfw/build/cygwin/config.mak x264.pc
+       rm -f config.mak config.h vfw/build/cygwin/config.mak x264.pc
 
 install: x264
        install -d $(DESTDIR)$(bindir) $(DESTDIR)$(includedir)