Commit b1d946cd authored by Loren Merritt's avatar Loren Merritt

remove Makefile.cygwin because build/cygwin/Makefile is more up to date.

put correct object file names in .depend


git-svn-id: svn://svn.videolan.org/x264/trunk@82 df754926-b1dd-0310-bc7b-ec298dee348c
parent 456e8fdc
......@@ -50,7 +50,8 @@ checkasm: testing/checkasm.c libx264.a
$(AS) $(ASFLAGS) -o $@ $<
.depend: $(SRCS) x264.c
$(CC) -MM $(CFLAGS) $(SRCS) x264.c 1> .depend
rm -f .depend
$(foreach SRC, $(SRCS) x264.c, $(CC) $(CFLAGS) $(SRC) -MM -MT $(SRC:%.c=%.o) 1>> .depend;)
depend: .depend
ifneq ($(wildcard .depend),)
......
# Makefile: tuned for i386/MMX cygwin system only
#
PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -DHAVE_SSE2
CC=gcc
CFLAGS=-g -Wall -I. -mno-cygwin -DDEBUG -O4 -funroll-loops -D__X264__ -UHAVE_MALLOC_H $(PFLAGS)
SRCS= common/mc.c common/predict.c common/pixel.c common/macroblock.c \
common/frame.c common/dct.c common/cpu.c common/cabac.c \
common/common.c common/mdate.c common/csp.c \
encoder/analyse.c encoder/me.c encoder/ratecontrol.c \
encoder/set.c encoder/macroblock.c encoder/cabac.c encoder/cavlc.c \
encoder/encoder.c \
common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c \
x264.c
AS= nasm
#for cygwin
ASFLAGS=-f win32 -DPREFIX $(PFLAGS)
ASMSRC= common/i386/dct-a.asm common/i386/cpu-a.asm common/i386/pixel-a.asm common/i386/mc-a.asm
OBJASM= $(ASMSRC:%.asm=%.o)
OBJS = $(SRCS:%.c=%.o)
DEP = depend
default: $(DEP) x264
libx264.a: $(OBJS) $(OBJASM)
ar rc libx264.a $(OBJS) $(OBJASM)
x264: libx264.a x264.o
$(CC) $(CFLAGS) -o x264 x264.o libx264.a -lm
checkasm: testing/checkasm.c libx264.a
$(CC) $(CFLAGS) -o checkasm $< libx264.a -lm
%.o: %.asm
$(AS) $(ASFLAGS) -o $@ $<
.depend: $(SRCS) x264.c
$(CC) -MM $(CFLAGS) $(SRCS) x264.c 1> .depend
depend: .depend
ifneq ($(wildcard .depend),)
include .depend
endif
clean:
rm -f $(OBJS) $(OBJASM) *.a x264.o .depend x264
distclean:
rm -f $(OBJS) $(OBJASM) *.a x264.o .depend x264
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment