Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Zenroom
Zenroom
Commits
9e2a0ca1
Commit
9e2a0ca1
authored
Aug 18, 2018
by
Jaromil
Browse files
fixes to javascript build flags
parent
9eddb8a0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Makefile
View file @
9e2a0ca1
...
...
@@ -46,17 +46,17 @@ apply-patches:
# TODO: improve flags according to
# https://github.com/kripken/emscripten/blob/master/src/settings.js
j
s
-node
:
cflags += -DARCH_JS -D'ARCH=
\"
JS
\"
'
j
s
-node
:
apply-patches lua53 milagro lpeglabel
j
avascript
-node
:
cflags += -DARCH_JS -D'ARCH=
\"
JS
\"
'
j
avascript
-node
:
apply-patches lua53 milagro lpeglabel
CC
=
${gcc}
CFLAGS
=
"
${cflags}
"
LDFLAGS
=
"
${ldflags}
"
LDADD
=
"
${ldadd}
"
\
make
-C
src js
@
mkdir
-p
build/nodejs
@
cp
-v
src/zenroom.js build/nodejs/
@
cp
-v
src/zenroom.js.mem build/nodejs/
j
s
-wasm
:
cflags += -DARCH_WASM -D'ARCH=
\"
WASM
\"
'
j
s
-wasm
:
ldflags += -s WASM=1 -s MODULARIZE=1
j
s
-wasm
:
apply-patches lua53 milagro lpeglabel
j
avascript
-wasm
:
cflags += -DARCH_WASM -D'ARCH=
\"
WASM
\"
'
j
avascript
-wasm
:
ldflags += -s WASM=1 -s MODULARIZE=1
j
avascript
-wasm
:
apply-patches lua53 milagro lpeglabel
CC
=
${gcc}
CFLAGS
=
"
${cflags}
"
LDFLAGS
=
"
${ldflags}
"
LDADD
=
"
${ldadd}
"
\
make
-C
src js
@
mkdir
-p
build/wasm
...
...
@@ -64,9 +64,9 @@ js-wasm: apply-patches lua53 milagro lpeglabel
@
cp
-v
src/zenroom.wasm build/wasm/
j
s
-demo
:
cflags += -DARCH_WASM -D'ARCH=
\"
WASM
\"
'
j
s
-demo
:
ldflags += -s WASM=1 -s ASSERTIONS=1 --shell-file ${extras}/shell_minimal.html -s NO_EXIT_RUNTIME=1
j
s
-demo
:
apply-patches lua53 milagro lpeglabel
j
avascript
-demo
:
cflags += -DARCH_WASM -D'ARCH=
\"
WASM
\"
'
j
avascript
-demo
:
ldflags += -s WASM=1 -s ASSERTIONS=1 --shell-file ${extras}/shell_minimal.html -s NO_EXIT_RUNTIME=1
j
avascript
-demo
:
apply-patches lua53 milagro lpeglabel
CC
=
${gcc}
CFLAGS
=
"
${cflags}
"
LDFLAGS
=
"
${ldflags}
"
LDADD
=
"
${ldadd}
"
\
make
-C
src js-demo
...
...
build/config.mk
View file @
9e2a0ca1
...
...
@@ -68,14 +68,13 @@ ldflags := -lm
system
:=
Darwin
endif
ifneq
(,$(findstring j
s
,$(MAKECMDGOALS)))
ifneq
(,$(findstring j
avascript
,$(MAKECMDGOALS)))
gcc
:=
${EMSCRIPTEN}
/emcc
ar
:=
${EMSCRIPTEN}
/emar
ld
:=
${gcc}
system
:=
Javascript
ldflags
:=
-s
"EXPORTED_FUNCTIONS='[
\"
_zenroom_exec
\"
,
\"
_zenroom_exec_tobuf
\"
,
\"
_zenroom_parse_ast
\"
,
\"
_set_debug
\"
]'"
-s
"EXTRA_EXPORTED_RUNTIME_METHODS='[
\"
ccall
\"
,
\"
cwrap
\"
]'"
-s
USE_SDL
=
0
-s
USE_PTHREADS
=
0
ldflags
:=
-s
"EXPORTED_FUNCTIONS='[
\"
_zenroom_exec
\"
,
\"
_zenroom_exec_tobuf
\"
,
\"
_zenroom_parse_ast
\"
,
\"
_set_debug
\"
]'"
-s
"EXTRA_EXPORTED_RUNTIME_METHODS='[
\"
ccall
\"
,
\"
cwrap
\"
]'"
-s
USE_SDL
=
0
-s
USE_PTHREADS
=
0
-lm
cflags
:=
-O2
-Wall
-I
${EMSCRIPTEN}
/system/include/libc
-DLIBRARY
ldflags
:=
-lm
endif
ifneq
(,$(findstring esp32,$(MAKECMDGOALS)))
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment