Rename CPP to CXX

CPP is the C pre processor.
This commit is contained in:
Khaled Hosny
2014-11-22 16:42:23 +02:00
parent a262e006d1
commit 4b8c71e0d5
+5 -5
View File
@@ -2,15 +2,15 @@ OS := $(shell uname)
IDIRS=-I./brotli/dec/ -I./brotli/enc/ -I./src IDIRS=-I./brotli/dec/ -I./brotli/enc/ -I./src
CPP = g++ CXX = g++
LFLAGS = LFLAGS =
GFLAGS=-no-canonical-prefixes -fno-omit-frame-pointer -m64 GFLAGS=-no-canonical-prefixes -fno-omit-frame-pointer -m64
CPPFLAGS = -c $(IDIRS) -std=c++0x $(GFLAGS) CXXFLAGS = -c $(IDIRS) -std=c++0x $(GFLAGS)
ifeq ($(OS), Darwin) ifeq ($(OS), Darwin)
CPPFLAGS += -DOS_MACOSX CXXFLAGS += -DOS_MACOSX
else else
CPPFLAGS += -fno-tree-vrp CXXFLAGS += -fno-tree-vrp
endif endif
SRCDIR = src SRCDIR = src
@@ -30,7 +30,7 @@ EXE_OBJS=$(patsubst %, $(SRCDIR)/%.o, $(EXECUTABLES))
all : $(OBJS) $(EXECUTABLES) all : $(OBJS) $(EXECUTABLES)
$(EXECUTABLES) : $(EXE_OBJS) deps $(EXECUTABLES) : $(EXE_OBJS) deps
$(CPP) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@ $(CXX) $(LFLAGS) $(OBJS) $(ENCOBJ) $(DECOBJ) $(SRCDIR)/$@.o -o $@
deps : deps :
make -C $(BROTLI)/dec make -C $(BROTLI)/dec