Mercurial > hg > piper-vamp-js
diff Makefile.inc @ 131:e4f215205fdc
INCPATH -> INCLUDES (is not a simple path, contains the -I flags already)
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Thu, 10 Nov 2016 18:56:45 +0000 |
| parents | a8d054ec22ac |
| children | 2255741a934c |
line wrap: on
line diff
--- a/Makefile.inc Thu Nov 10 18:54:11 2016 +0000 +++ b/Makefile.inc Thu Nov 10 18:56:45 2016 +0000 @@ -70,18 +70,18 @@ DEFINES := $(DEFINES) -INCPATH := -I$(SRC_DIR) -I$(SDK_DIR) -I$(PIPERCPP_DIR) $(INCPATH) +INCLUDES := -I$(SRC_DIR) -I$(SDK_DIR) -I$(PIPERCPP_DIR) $(INCLUDES) em: $(EM_MODULE) em: CXX := em++ em: CC := emcc -em: CXXFLAGS := -std=c++11 -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCPATH) -em: CFLAGS := -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCPATH) +em: CXXFLAGS := -std=c++11 -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCLUDES) +em: CFLAGS := -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(EMFLAGS) $(INCLUDES) em: LDFLAGS := $(EMFLAGS) linux: $(SO_MODULE) -linux: CXXFLAGS := -std=c++11 -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(INCPATH) -linux: CFLAGS := -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(INCPATH) +linux: CXXFLAGS := -std=c++11 -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(INCLUDES) +linux: CFLAGS := -fPIC -Wall -Wextra $(DEFINES) $(OPTFLAGS) $(INCLUDES) linux: LDFLAGS := -shared -Wl,-Bsymbolic -Wl,-soname=$(SO_MODULE) -Wl,-z,defs -Wl,--version-script=$(SRC_DIR)/piper.map -ldl OBJDIR := o @@ -93,11 +93,11 @@ o/%.o: %.cpp mkdir -p $(dir $@) - $(CXX) -c $(INCPATH) $(CXXFLAGS) -o $@ $< + $(CXX) -c $(INCLUDES) $(CXXFLAGS) -o $@ $< o/%.o: %.c mkdir -p $(dir $@) - $(CC) -c $(INCPATH) $(CFLAGS) -o $@ $< + $(CC) -c $(INCLUDES) $(CFLAGS) -o $@ $< $(EM_MODULE): $(OBJECTS) $(CXX) $(OPTFLAGS) -o $@ $^ $(LDFLAGS) && \