diff options
| author | Jacek Caban <jacek@codeweavers.com> | 2015-05-18 13:32:38 -0700 |
|---|---|---|
| committer | Jacek Caban <jacek@codeweavers.com> | 2015-05-18 13:32:38 -0700 |
| commit | 101563f40090075802d506818bc56758a0867bee (patch) | |
| tree | d2a56dfc29898efd89cd9487168856af6d7abd56 | |
| parent | d389b625839d145d8aa49174a18edfb32f73ccf3 (diff) | |
| download | nspr-hg-101563f40090075802d506818bc56758a0867bee.tar.gz | |
Bug 856404 - Use correct static library prefix on mingw. r=ted,wtc.
| -rw-r--r-- | config/rules.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/rules.mk b/config/rules.mk index cbbf5f3a..fc62184b 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -81,18 +81,18 @@ ifeq (,$(filter-out WINNT WINCE OS2,$(OS_ARCH))) # other platforms do not. # 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) 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) SHARED_LIB_PDB = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).pdb endif ifdef MSC_VER +LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) else +LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION)_s.$(LIB_SUFFIX) IMPORT_LIBRARY = $(OBJDIR)/lib$(LIBRARY_NAME)$(LIBRARY_VERSION).$(LIB_SUFFIX) endif |