diff options
| author |  Jan Tattermusch <jtattermusch@users.noreply.github.com> | 2017-01-15 13:24:41 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2017-01-15 13:24:41 +0100 |
| commit | cc2e048e84eaa418cab393553594a3fefb891037 (patch) | |
| tree | e72122d40a7c492da1b8cf7780b0305e79d15f49 /templates | |
| parent | 88a934e9f8af7529262f1fec3c17061566c0da7f (diff) | |
| parent | 44b2d08149af2f976eca8b7fdb155543a101faaf (diff) | |
Merge pull request #9342 from emmenlau/emmenlau_use_import_libraries_for_mingw
Makefile.template: use import libraries for mingw
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/Makefile.template | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/templates/Makefile.template b/templates/Makefile.template index 230f16c0c8..6f4db26f2b 100644 --- a/templates/Makefile.template +++ b/templates/Makefile.template @@ -1305,7 +1305,7 @@ $(Q) $(INSTALL) -d $(prefix)/lib $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/$(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) $(prefix)/lib/$(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) ifeq ($(SYSTEM),MINGW32) - $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}-imp.a $(prefix)/lib/lib${lib.name}-imp.a + $(Q) $(INSTALL) $(LIBDIR)/$(CONFIG)/lib${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]})-dll.a $(prefix)/lib/lib${lib.name}.a else ifneq ($(SYSTEM),Darwin) $(Q) ln -sf $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) $(prefix)/lib/lib${lib.name}.so.${settings.core_version.major} $(Q) ln -sf $(SHARED_PREFIX)${lib.name}$(SHARED_VERSION_${lang_to_var[lib.language]}).$(SHARED_EXT_${lang_to_var[lib.language]}) $(prefix)/lib/lib${lib.name}.so @@ -1519,7 +1519,7 @@ assert dep_lib, 'lib %s not found (in %s)' % (dep, lib.name) link_libs = link_libs + ' -l' + dep lib_deps = lib_deps + ' $(LIBDIR)/$(CONFIG)/lib' + dep + '.$(SHARED_EXT_' + lang_to_var[dep_lib.language] + ')' - mingw_libs = mingw_libs + ' -l' + dep + '-imp' + mingw_libs = mingw_libs + ' -l' + dep + '$(SHARED_VERSION_' + lang_to_var[dep_lib.language] + ')-dll' mingw_lib_deps = mingw_lib_deps + ' $(LIBDIR)/$(CONFIG)/' + dep + '$(SHARED_VERSION_' + lang_to_var[dep_lib.language] + ').$(SHARED_EXT_' + lang_to_var[dep_lib.language] + ')' security = lib.get('secure', 'check') |