diff options
| author | Jacek Caban <jacek@codeweavers.com> | 2014-10-09 13:44:22 -0400 |
|---|---|---|
| committer | Jacek Caban <jacek@codeweavers.com> | 2014-10-09 13:44:22 -0400 |
| commit | 5e60a017cd821ad6c68c0057f897a900811dcea5 (patch) | |
| tree | 80ea9ede22183ddccb3cec8f138f98adccf2e69a | |
| parent | 1289482a988709f5347a783dfd9d77613703db41 (diff) | |
| download | nspr-hg-NSPR_4_10_8_BETA1.tar.gz | |
Bug 1060401 - change import library name under mingw. r=tedNSPR_4_10_8_BETA1
| -rw-r--r-- | config/rules.mk | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/config/rules.mk b/config/rules.mk index cc017593..cbbf5f3a 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -83,15 +83,19 @@ ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH))) ifeq (,$(filter-out WIN95 WINCE WINMO OS2,$(OS_TARGET))) LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) SHARED_LIB_PDB = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb else LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) SHARED_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(DLL_SUFFIX) -IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) SHARED_LIB_PDB = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb endif +ifdef MSC_VER +IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) +else +IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) +endif + else LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) |