Skip to content

Commit 97f188e

Browse files
committed
Update JS build.
1 parent 052fd00 commit 97f188e

5 files changed

Lines changed: 72 additions & 22 deletions

File tree

.gitignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,6 @@ src/lib/reservoir.o
8282
src/lib/tables.lo
8383
src/lib/tables.o
8484
shine-*.tar.gz
85-
*.c.o
85+
*.bc
8686
*.mp3
8787
node_modules

js/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ LINKFLAGS:=-s EXPORTED_FUNCTIONS=$(EXPORTED_FUNCTIONS) --memory-init-file 0 $(CF
1010
C_FILES:=$(wildcard ../src/lib/*.c) src/wrapper.c
1111
HEADER_FILES:=$(wildcard ../src/lib/*.h)
1212
SOURCES:=$(C_FILES) $(HEADER_FILES)
13-
OBJECTS:=$(C_FILES:%.c=%.c.o)
13+
OBJECTS:=$(C_FILES:%.c=%.bc)
1414

1515
all: dist/libshine.js
1616

1717
dist/libshine.js: $(SOURCES) $(OBJECTS) src/pre.js src/post.js
1818
$(EMCC) $(LINKFLAGS) --pre-js src/pre.js --post-js src/post.js $(OBJECTS) -o $@
1919

20-
%.c.o: %.c
20+
%.bc: %.c
2121
$(EMCC) $(CFLAGS) -I../src/lib -c $< -o $@
2222

2323
clean:
24-
rm -f *.c.o ../src/lib/*.c.o
24+
rm -f *.bc ../src/lib/*.bc

js/dist/libshine.js

Lines changed: 5 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/test/node/package-lock.json

Lines changed: 49 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/test/node/package.json

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -4,23 +4,24 @@
44
"version": "0.0.1",
55
"homepage": "https://github.com/savonet/shine",
66
"author": "Romain Beauxis <toots@rastageeks.org",
7-
"repository":
8-
{
9-
"type":"git",
10-
"url":"git://github.com/savonet/shine"
11-
},
12-
"bugs":
13-
{
14-
"mail":"toots@rastageeks.org",
15-
"url":"http://github.com/savonet/shine/issues"
16-
},
7+
"repository": {
8+
"type": "git",
9+
"url": "git://github.com/savonet/shine"
10+
},
11+
"bugs": {
12+
"mail": "toots@rastageeks.org",
13+
"url": "http://github.com/savonet/shine/issues"
14+
},
1715
"main": "test.coffee",
1816
"scripts": {
1917
"test": "coffee ./encode.coffee && coffee ./rounds.coffee"
2018
},
21-
"engine": {"node": ">= 0.10.7", "npm": "1"},
19+
"engine": {
20+
"node": ">= 0.10.7",
21+
"npm": "1"
22+
},
2223
"dependencies": {
23-
"coffee-script" : "1.6.3",
24-
"wav" : "0.1.0"
24+
"coffee-script": "1.6.3",
25+
"wav": "0.1.0"
2526
}
2627
}

0 commit comments

Comments
 (0)