From: Loren Merritt <pengvado@videolan.org>
Date: Mon, 24 Oct 2005 16:15:11 +0000 (+0000)
Subject: delete build/cygwin because it's handled in the main configure/makefile.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d969739baac6b9f7e9bcb44c3b7dbc21890dd1b;p=libx264

delete build/cygwin because it's handled in the main configure/makefile.


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

diff --git a/build/cygwin/Makefile b/build/cygwin/Makefile
deleted file mode 100644
index 7a39d1ad..00000000
--- a/build/cygwin/Makefile
+++ /dev/null
@@ -1,132 +0,0 @@
-##############################################################################
-#
-# Makefile for lib264.a and x264
-#
-# Author: x264 by Laurent Aimar <fenrir@via.ecp.fr>
-#
-# $Id: Makefile,v 1.4 2004/06/18 02:00:40 chenm001 Exp $
-##############################################################################
-
-# Current dir
-DIR_CUR=$(shell pwd)
-
-# Path to src
-DIR_SRC=$(DIR_CUR)/../..
-
-DIR_INSTALL="/usr/local"
-
-# Sources
-SRC_C= 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 encoder/eval.c \
-       common/i386/mc-c.c common/i386/dct-c.c common/i386/predict.c
-
-SRC_ASM= common/i386/dct-a.asm common/i386/cpu-a.asm common/i386/pixel-a.asm \
-         common/i386/mc-a.asm common/i386/mc-a2.asm common/i386/predict-a.asm
-
-# Alias
-RM= rm -rf
-
-##############################################################################
-# PFLAGS
-##############################################################################
-PFLAGS=-DARCH_X86 -DHAVE_MMXEXT -UHAVE_SSE2
-
-##############################################################################
-# CFLAGS
-##############################################################################
-
-# Constants which should not be modified
-# The `mingw-runtime` package is required when building with -mno-cygwin
-CFLAGS += -I$(DIR_SRC)
-CFLAGS += -mno-cygwin
-CFLAGS += -D__X264__ -D_CYGWIN
-CFLAGS += $(PFLAGS)
-
-# Optional Compiler options
-ifdef NDEBUG
-CFLAGS += -s -DNDEBUG
-else
-CFLAGS += -g -DDEBUG
-endif
-CFLAGS += -Wall
-CFLAGS += -O3
-CFLAGS += -finline-functions
-CFLAGS += -funroll-loops
-CFLAGS += -ffast-math
-
-
-##############################################################################
-# Compiler flags for linking stage
-##############################################################################
-
-LDFLAGS += -L$(DIR_LIB) -lx264
-
-##############################################################################
-# ASM
-##############################################################################
-AS= nasm
-ASFLAGS= -f win32 -DPREFIX $(PFLAGS)
-##############################################################################
-# Rules
-##############################################################################
-
-OBJECTS = $(SRC_C:.c=.obj)
-OBJECTS+= $(SRC_ASM:.asm=.obj)
-
-.SUFFIXES: .obj .asm .c
-
-DIR_BUILD= $(DIR_CUR)/bin
-VPATH = $(DIR_SRC):$(DIR_BUILD)
-
-all: libx264.a x264.exe
-
-$(DIR_BUILD):
-	@echo " D: $(DIR_BUILD)"
-	@mkdir -p $(DIR_BUILD)
-
-.asm.obj:
-	@echo " A: $(@D)/$(<F)"
-	@mkdir -p $(DIR_BUILD)/$(@D)
-	@$(AS) $(ASFLAGS) -o $(DIR_BUILD)/$@ $<
-
-.c.obj:
-	@echo " C: $(@D)/$(<F)"
-	@mkdir -p $(DIR_BUILD)/$(@D)
-	@$(CC) $(CFLAGS) -c -o $(DIR_BUILD)/$@ $<
-
-encoder/set.obj: config.h
-config.h: $(wildcard $(DIR_SRC)/.svn/entries $(DIR_SRC)/*/.svn/entries $(DIR_SRC)/*/*/.svn/entries)
-	@echo " C: $@"
-	@cd $(DIR_SRC) && \
-	./version.sh
-
-libx264.a: $(DIR_BUILD) $(OBJECTS)
-	@echo " L: $(@F)"
-	@cd $(DIR_BUILD) && \
-	ar rc libx264.a $(OBJECTS) && \
-	cp -f libx264.a $(DIR_SRC)
-
-x264.exe: $(DIR_BUILD) $(OBJECTS) x264.obj
-	@echo " L: $(@F)"
-	@cd $(DIR_BUILD) && \
-	$(CC) $(CFLAGS) -o x264.exe x264.obj libx264.a -lm -lvfw32 && \
-	cp -f x264.exe $(DIR_SRC)
-
-checkasm.exe: $(DIR_BUILD) libx264.a $(OBJECTS) testing/checkasm.obj
-	@echo " L: $(@F)"
-	@cd $(DIR_BUILD) && \
-	$(CC) $(CFLAGS) -o checkasm.exe testing/checkasm.obj libx264.a -lm && \
-	cp -f checkasm.exe $(DIR_SRC)
-
-clean:
-	@echo " Cl: Object files and target lib"
-	@$(RM) $(DIR_BUILD) $(DIR_SRC)/config.h
-
-install: x264.exe
-	install x264.h $(DIR_INSTALL)/include/
-	install libx264.a $(DIR_INSTALL)/lib/
-	install x264.exe $(DIR_INSTALL)/bin/