From 18cc767292744c3077c9bb4dc971cffc1b07c196 Mon Sep 17 00:00:00 2001 From: pancake Date: Sat, 7 Sep 2013 02:20:38 +0200 Subject: [PATCH] More emscripten/android build fixes --- binr/r2agent/Makefile | 2 +- binr/ragg2/Makefile | 2 +- binr/rahash2/Makefile | 5 +++-- binr/rasm2/Makefile | 2 +- binr/rax2/index.html | 10 ++++++++-- doc/emscripten | 10 ++++------ libr/Makefile | 13 ++++++++++++- shlr/java/Makefile | 3 ++- shlr/tcc/Makefile | 8 ++++---- sys/emscripten.sh | 20 ++++++++++++++++++++ 10 files changed, 56 insertions(+), 19 deletions(-) create mode 100755 sys/emscripten.sh diff --git a/binr/r2agent/Makefile b/binr/r2agent/Makefile index 80d2457aa4..3d208fbc03 100644 --- a/binr/r2agent/Makefile +++ b/binr/r2agent/Makefile @@ -1,4 +1,4 @@ BIN=r2agent -BINDEPS=r_socket r_util r_cons +BINDEPS=r_socket r_cons r_util include ../rules.mk diff --git a/binr/ragg2/Makefile b/binr/ragg2/Makefile index 8fc1cb744e..e653e0f59a 100644 --- a/binr/ragg2/Makefile +++ b/binr/ragg2/Makefile @@ -1,4 +1,4 @@ BIN=ragg2 -BINDEPS=r_egg r_bin r_syscall r_asm r_db r_util r_parse r_lib r_flags r_anal r_reg r_diff r_cons +BINDEPS=r_egg r_bin r_syscall r_asm r_db r_parse r_lib r_flags r_anal r_reg r_diff r_cons r_util include ../rules.mk diff --git a/binr/rahash2/Makefile b/binr/rahash2/Makefile index 63981155da..c1d155d4af 100644 --- a/binr/rahash2/Makefile +++ b/binr/rahash2/Makefile @@ -1,6 +1,7 @@ BIN=rahash2 -BINDEPS=r_io r_hash r_util r_socket r_asm r_cons -BINDEPS+=r_anal r_lib r_syscall r_reg r_diff r_db r_parse +BINDEPS=r_hash +#BINDEPS=r_io r_hash r_util r_socket r_asm r_cons +#BINDEPS+=r_anal r_lib r_syscall r_reg r_diff r_db r_parse BINDEPS+=r_flags include ../rules.mk diff --git a/binr/rasm2/Makefile b/binr/rasm2/Makefile index b44c6bfafd..c8113a37c3 100644 --- a/binr/rasm2/Makefile +++ b/binr/rasm2/Makefile @@ -1,4 +1,4 @@ BIN=rasm2 -BINDEPS=r_cons r_flags r_parse r_asm r_lib r_syscall r_anal r_reg r_diff r_db r_util +BINDEPS=r_asm r_parse r_lib r_syscall r_anal r_reg r_diff r_db r_flags r_cons r_util include ../rules.mk diff --git a/binr/rax2/index.html b/binr/rax2/index.html index 0650d80968..809cdcd40a 100644 --- a/binr/rax2/index.html +++ b/binr/rax2/index.html @@ -14,12 +14,18 @@ canvas.emscripten { border: 0px none; } - +