diff options
| author | Thomas Coudray <amanone@gmail.com> | 2014-06-20 13:26:29 +0100 |
|---|---|---|
| committer | Thomas Coudray <amanone@gmail.com> | 2014-06-20 13:26:29 +0100 |
| commit | 1fa0fe2786c851fc06766e8a77a882298d2cc64b (patch) | |
| tree | 81587e8c90b3c4f6c4c4e5d379ab37c30fb9c4af | |
| parent | 7a3f6d49415fd5f1fa99d25aba40c7884d5774a4 (diff) | |
| download | tinycc-1fa0fe2786c851fc06766e8a77a882298d2cc64b.tar.gz tinycc-1fa0fe2786c851fc06766e8a77a882298d2cc64b.tar.bz2 | |
Revert "Win: Enable use "*.def + *.c" files as library instead of *.a by "-l" option"
This reverts commit 7a3f6d49415fd5f1fa99d25aba40c7884d5774a4.
| -rw-r--r-- | libtcc.c | 11 |
1 files changed, 2 insertions, 9 deletions
@@ -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; |
