diff --git a/makefile b/makefile index 647dd88..3f80c2d 100644 --- a/makefile +++ b/makefile @@ -2,10 +2,10 @@ export FP_TYPE ?= float CONFIG = Debug PREFIX=/usr -GVPS_PREFIX = /usr +GVPS_PREFIX = libgvps CC ?= $(CROSS)gcc AR = $(CROSS)ar -CFLAGS_COMMON = -I$(GVPS_PREFIX)/include -DFP_TYPE=$(FP_TYPE) -std=c99 -Wall -fPIC $(CFLAGSEXT) +CFLAGS_COMMON = -I$(GVPS_PREFIX) -DFP_TYPE=$(FP_TYPE) -std=c99 -Wall -fPIC $(CFLAGSEXT) CFLAGS_DBG = $(CFLAGS_COMMON) -Og -g CFLAGS_REL = $(CFLAGS_COMMON) -Ofast ifeq ($(CONFIG), Debug) @@ -22,8 +22,8 @@ default: $(OUT_DIR)/libpyin.a test: $(OUT_DIR)/pyin-test $(OUT_DIR)/pyin-test test/vaiueo2d.wav -$(OUT_DIR)/pyin-test: $(OUT_DIR)/libpyin.a test/test.c external/matlabfunctions.c $(GVPS_PREFIX)/lib/libgvps.a - $(CC) $(CFLAGS) -o $(OUT_DIR)/pyin-test test/test.c external/matlabfunctions.c $(OUT_DIR)/libpyin.a $(GVPS_PREFIX)/lib/libgvps.a -lm +$(OUT_DIR)/pyin-test: $(OUT_DIR)/libpyin.a test/test.c external/matlabfunctions.c $(GVPS_PREFIX)/build/libgvps.a + $(CC) $(CFLAGS) -o $(OUT_DIR)/pyin-test test/test.c external/matlabfunctions.c $(OUT_DIR)/libpyin.a $(GVPS_PREFIX)/build/libgvps.a -lm $(OUT_DIR)/libpyin.a: $(OBJS) $(AR) $(ARFLAGS) $(OUT_DIR)/libpyin.a $(OBJS) $(LIBS) diff --git a/pyin.c b/pyin.c index 320cf44..1055930 100644 --- a/pyin.c +++ b/pyin.c @@ -31,7 +31,7 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include "math-funcs.h" #include "pyin.h" diff --git a/readme.md b/readme.md index 6b5caca..dd97fa7 100644 --- a/readme.md +++ b/readme.md @@ -7,14 +7,10 @@ Compile --- ``` -git submodule init -git submodule update -cd external/libgvps -mkdir build -make -cd ../.. -mkdir build -make +git clone https://github.com/Sleepwalking/libgvps.git +git clone https://github.com/Sleepwalking/libpyin.git +make -C libgvps +make GVPS_PREFIX=../libgvps -C libpyin ``` Works cited