coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2025-12-13 15:09:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename Makefile to avoid name clash with gclient runhooks

Browse Source 
BUG=none
TEST=none
R=wuwang@google.com

Review URL: https://webrtc-codereview.appspot.com/4079005

git-svn-id: http://libyuv.googlecode.com/svn/trunk@869 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2013-11-20 23:50:04 +00:00
parent 2d8824079a
commit adaff9f3d5
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.chromium
View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 866
Version: 869
License: BSD
License File: LICENSE

2
include/libyuv/version.h
View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 866
#define LIBYUV_VERSION 869
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

9
Makefile → linux.mk
View File

@ -1,6 +1,5 @@
# This is a generic makefile for libyuv for gcc.
# Caveat: This file will get overwritten by GYP if projects are generated
# with GYP_GENERATORS=make
# make -f linux.mk CC=clang++
CC=g++
CCFLAGS=-O2 -fomit-frame-pointer -Iinclude/
@ -34,13 +33,13 @@ LOCAL_OBJ_FILES := \
.cc.o:
$(CC) -c $(CCFLAGS) $*.cc -o $*.o
all: libyuv.a convert Makefile
all: libyuv.a convert linux.mk
libyuv.a: $(LOCAL_OBJ_FILES) Makefile
libyuv.a: $(LOCAL_OBJ_FILES) linux.mk
$(AR) $(ARFLAGS) -o $@ $(LOCAL_OBJ_FILES)
# A test utility that uses libyuv conversion.
convert: util/convert.cc Makefile
convert: util/convert.cc linux.mk
$(CC) $(CCFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a
clean: