coffee/libyuv
1
0
Fork 0
mirror of https://chromium.googlesource.com/libyuv/libyuv synced 2026-10-28 18:07:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Switch to CXX for linux.mk

Browse Source 
BUG=none
TESTED=untested
R=tpsiaki@google.com

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

git-svn-id: http://libyuv.googlecode.com/svn/trunk@977 16f28f9a-4ce2-e073-06de-1de4eb20be90
This commit is contained in:
fbarchard@google.com 2014-01-28 22:05:36 +00:00
parent 16ea9c816b
commit 6916811eb2
3 changed files with 11 additions and 10 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: 976
Version: 977
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 976
#define LIBYUV_VERSION 977
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT

17
linux.mk
View File

@ -1,8 +1,9 @@
# This is a generic makefile for libyuv for gcc.
# make -f linux.mk CC=clang++
# make -f linux.mk CXX=clang++
CC=g++
CCFLAGS=-O2 -fomit-frame-pointer -Iinclude/
CXX?=g++
CXXFLAGS?=-O2 -fomit-frame-pointer
CXXFLAGS+=-Iinclude/
LOCAL_OBJ_FILES := \
source/compare.o \
@ -32,16 +33,16 @@ LOCAL_OBJ_FILES := \
source/video_common.o
.cc.o:
$(CC) -c $(CCFLAGS) $*.cc -o $*.o
$(CXX) -c $(CXXFLAGS) $*.cc -o $*.o
all: libyuv.a convert linux.mk
all: libyuv.a convert
libyuv.a: $(LOCAL_OBJ_FILES) linux.mk
libyuv.a: $(LOCAL_OBJ_FILES)
$(AR) $(ARFLAGS) -o $@ $(LOCAL_OBJ_FILES)
# A test utility that uses libyuv conversion.
convert: util/convert.cc linux.mk
$(CC) $(CCFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a
convert: util/convert.cc libyuv.a
$(CXX) $(CXXFLAGS) -Iutil/ -o $@ util/convert.cc libyuv.a
clean:
/bin/rm -f source/*.o *.ii *.s libyuv.a convert