Skip to content

fixed GVPS paths and updated README to not reference missing submodules #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
nils-werner wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fixed GVPS paths and updated README to not reference missing submodules #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand All @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion pyin.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <libgvps/gvps.h>
#include <gvps.h>
#include "math-funcs.h"
#include "pyin.h"

Expand Down
12 changes: 4 additions & 8 deletions readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down