* Some fixes for static builds

This commit is contained in:
pancake 2011-04-23 04:33:45 +02:00
parent d2401f1ea0
commit 41d4e0bc0b
7 changed files with 15 additions and 3 deletions

View File

@ -42,7 +42,7 @@ struct dalvik_opcodes_t {
int fmt;
};
const struct dalvik_opcodes_t dalvik_opcodes[256] = {
static const struct dalvik_opcodes_t dalvik_opcodes[256] = {
{"nop", 2, fmtop}, /* 0x00 */
{"move", 2, fmtopvAvB},
{"move/from16", 4, fmtopvAAvBBBB},

View File

@ -21,10 +21,12 @@ LDFLAGS+=${PIC_CFLAGS}
else
# TODO: is there somebody brave enought to replace this perl oneliner?
ifneq ($(DEPS),)
LDFLAGS+=`echo "${DEPS} " | perl -ne 's,r_([^ ]*),../$$1/libr_$$1.a,g; print'`
#LDFLAGS+=`echo "${DEPS} " | perl -ne 's,r_([^ ]*),../$$1/libr_$$1.a,g; print'`
LDFLAGS+=`echo $DEPS | awk '{gsub(/r_([^ ]*)/,"../&/lib&.a");gsub(/\/r_/,"\/");print}'`
endif
ifneq ($(BINDEPS),)
LDFLAGS+=`echo "${BINDEPS} " | if [ -d ../../libr ]; then perl -ne 's,r_([^ ]*),../../libr/$$1/libr_$$1.a,g; print' ; else perl -ne 's,r_([^ ]*),../../$$1/libr_$$1.a,g; print' ; fi `
#LDFLAGS+=`echo "${BINDEPS} " | if [ -d ../../libr ]; then perl -ne 's,r_([^ ]*),../../libr/$$1/libr_$$1.a,g; print' ; else perl -ne 's,r_([^ ]*),../../$$1/libr_$$1.a,g; print' ; fi `
LDFLAGS+=`echo "${BINDEPS} " | if [ -d ../../libr ]; then echo $BINDEPS | awk '{gsub(/r_([^ ]*)/,"../../libr/&/lib&.a");gsub(/\/r_/,"\/");print}' ; else awk '{gsub(/r_([^ ]*)/,"../../&/lib&.a");gsub(/\/r_/,"\/");print}'; fi`
endif
endif

View File

@ -105,7 +105,9 @@ static struct r_lang_plugin_t r_lang_plugin_lua = {
.set_argv = NULL,
};
#ifndef CORELIB
struct r_lib_struct_t radare_plugin = {
.type = R_LIB_TYPE_LANG,
.data = &r_lang_plugin_lua,
};
#endif

View File

@ -90,7 +90,9 @@ static struct r_lang_plugin_t r_lang_plugin_perl = {
.set_argv = (void *)setargv,
};
#ifndef CORELIB
struct r_lib_struct_t radare_plugin = {
.type = R_LIB_TYPE_LANG,
.data = &r_lang_plugin_perl,
};
#endif

View File

@ -101,7 +101,9 @@ static struct r_lang_plugin_t r_lang_plugin_ruby = {
.set_argv = NULL,
};
#ifndef CORELIB
struct r_lib_struct_t radare_plugin = {
.type = R_LIB_TYPE_LANG,
.data = &r_lang_plugin_ruby,
};
#endif

View File

@ -25,7 +25,9 @@ static struct r_lang_plugin_t r_lang_plugin_tcc = {
.set_argv = NULL,
};
#ifndef CORELIB
struct r_lib_struct_t radare_plugin = {
.type = R_LIB_TYPE_LANG,
.data = &r_lang_plugin_tcc,
};
#endif

View File

@ -188,7 +188,9 @@ struct r_parse_plugin_t r_parse_plugin_x86_pseudo = {
.varsub = &varsub,
};
#ifndef CORELIB
struct r_lib_struct_t radare_plugin = {
.type = R_LIB_TYPE_PARSE,
.data = &r_parse_plugin_x86_pseudo
};
#endif