Mercurial > hg > piper-vamp-js
diff Makefile.inc @ 121:d1a99d44812b
Trim down examples, tidy
| author | Chris Cannam <c.cannam@qmul.ac.uk> |
|---|---|
| date | Thu, 10 Nov 2016 12:07:51 +0000 |
| parents | 975719b38bdb |
| children | 6d651bfc93b9 |
line wrap: on
line diff
--- a/Makefile.inc Thu Nov 10 11:34:04 2016 +0000 +++ b/Makefile.inc Thu Nov 10 12:07:51 2016 +0000 @@ -15,9 +15,11 @@ @echo "Note: when switching from one target to another, make clean first" @echo -SRC_DIR := src -SDK_DIR := ../vamp-plugin-sdk -PIPERCPP_DIR := ../piper-cpp +MY_DIR := $(realpath $(dir $(lastword $(MAKEFILE_LIST)))) + +SRC_DIR := $(MY_DIR)/src +SDK_DIR := $(MY_DIR)/../vamp-plugin-sdk +PIPERCPP_DIR := $(MY_DIR)/../piper-cpp ADAPTER_HEADERS := \ $(SRC_DIR)/PiperAdapter.h \ @@ -59,7 +61,7 @@ $(EMFLAGS) CXX_SOURCES := $(MODULE_SOURCE) $(ADAPTER_SOURCES) $(PLUGIN_SOURCES) $(SDK_SOURCES) $(OTHER_SOURCES) -C_SOURCES := $(PLUGIN_C_SOURCES) +C_SOURCES := $(PLUGIN_C_SOURCES) $(C_SOURCES) #OPTFLAGS := -g3 OPTFLAGS := -O3 -ffast-math @@ -96,7 +98,7 @@ $(CC) -c $(INCPATH) $(CFLAGS) -o $@ $< $(EM_MODULE): $(OBJECTS) - $(CXX) $(OPTFLAGS) $(EMFLAGS) -o $@ $^ $(LDFLAGS) && \ + $(CXX) $(OPTFLAGS) -o $@ $^ $(LDFLAGS) && \ ( echo "if (typeof process === 'object') module.exports=$(MODULE_SYMBOL);" >> $(EM_MODULE) ) $(SO_MODULE): $(OBJECTS)