diff options
| author | fbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90> | 2014-01-28 22:05:36 +0000 |
|---|---|---|
| committer | fbarchard@google.com <fbarchard@google.com@16f28f9a-4ce2-e073-06de-1de4eb20be90> | 2014-01-28 22:05:36 +0000 |
| commit | 6916811eb2ac9afa2d27e4742a160f5a90761919 (patch) | |
| tree | a9ab2bedcb559df0d199af2d9c72979070f63d62 /linux.mk | |
| parent | 16ea9c816b5468f7651336b9ead21041fa3e5a6e (diff) | |
| download | libyuv-6916811eb2ac9afa2d27e4742a160f5a90761919.tar.gz | |
Switch to CXX for linux.mk
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
Diffstat (limited to 'linux.mk')
| -rw-r--r-- | linux.mk | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -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 |