meesbs
/
tinycc
forked from Mirrors/tinycc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Win: Enable use "*.def + *.c" files as library instead of *.a by "-l" option" 

This reverts commit 7a3f6d4941.
master
Thomas Coudray 2014-06-20 13:26:29 +01:00
parent 7a3f6d4941
commit 1fa0fe2786
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libtcc.c
View File

@ -1300,7 +1300,7 @@ ST_FUNC int tcc_add_crt(TCCState *s, const char *filename)
LIBTCCAPI int tcc_add_library(TCCState *s, const char *libraryname)
{
#ifdef TCC_TARGET_PE
const char *libs[] = { "%s/%s.def", "%s/lib%s.def", "%s/%s.dll", "%s/lib%s.dll", "%s/lib%s.a", "%s/%s.c", NULL };
const char *libs[] = { "%s/%s.def", "%s/lib%s.def", "%s/%s.dll", "%s/lib%s.dll", "%s/lib%s.a", NULL };
const char **pp = s->static_link ? libs + 4 : libs;
#else
const char *libs[] = { "%s/lib%s.so", "%s/lib%s.a", NULL };
@ -1308,15 +1308,8 @@ LIBTCCAPI int tcc_add_library(TCCState *s, const char *libraryname)
#endif
while (*pp) {
if (0 == tcc_add_library_internal(s, *pp,
libraryname, 0, s->library_paths, s->nb_library_paths)) {
#ifdef TCC_TARGET_PE
/* extra search for *.c file together with *.def file */
if (pp < libs + 2)
tcc_add_library_internal(s, *(libs + 5), libraryname, 0,
s->library_paths, s->nb_library_paths);
#endif
libraryname, 0, s->library_paths, s->nb_library_paths))
return 0;
}
++pp;
}
return -1;