From 3020a4765d6d83b8d98a87dd78b822cc8b313652 Mon Sep 17 00:00:00 2001 From: grischka Date: Sat, 19 Dec 2009 22:09:27 +0100 Subject: [PATCH] tccpe: with -l try also with "lib" prefix -lfoo searches: foo.def, libfoo.def, foo.dll, libfoo.dll --- tccpe.c | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/tccpe.c b/tccpe.c index 3a997bf3..69161f90 100644 --- a/tccpe.c +++ b/tccpe.c @@ -1611,15 +1611,18 @@ PUB_FN int pe_load_file(struct TCCState *s1, const char *filename, int fd) return ret; } -int pe_add_dll(struct TCCState *s, const char *libraryname) +int pe_add_dll(struct TCCState *s, const char *libname) { - char buf[MAX_PATH]; - snprintf(buf, sizeof(buf), "%s.def", libraryname); - if (tcc_add_dll(s, buf, 0) == 0) - return 0; - snprintf(buf, sizeof(buf), "%s.dll", libraryname); - if (tcc_add_dll(s, buf, 0) == 0) - return 0; + static const char *pat[] = { + "%s.def", "lib%s.def", "%s.dll", "lib%s.dll", NULL + }; + const char **p = pat; + do { + char buf[MAX_PATH]; + snprintf(buf, sizeof(buf), *p, libname); + if (tcc_add_dll(s, buf, 0) == 0) + return 0; + } while (*++p); return -1; } -- 2.11.4.GIT