diff options
Diffstat (limited to 'lib/ds/Makefile.in')
| -rw-r--r-- | lib/ds/Makefile.in | 30 |
1 files changed, 27 insertions, 3 deletions
diff --git a/lib/ds/Makefile.in b/lib/ds/Makefile.in index b6aa7676..4e7234fd 100644 --- a/lib/ds/Makefile.in +++ b/lib/ds/Makefile.in @@ -59,10 +59,13 @@ HEADERS = \ HEADERS := $(addprefix $(srcdir)/, $(HEADERS)) ifeq ($(OS_ARCH), WINNT) +ifdef NS_USE_GCC +DLLBASE=-Wl,--image-base -Wl,0x30000000 +else DLLBASE=/BASE:0x30000000 +endif # GCC RES=$(OBJDIR)/plds.res RESNAME=plds.rc -OS_LIBS = user32.lib endif # WINNT ifeq ($(OS_ARCH), AIX) @@ -77,6 +80,27 @@ ifeq ($(OS_ARCH),IRIX) OS_LIBS = -lc endif +ifeq ($(OS_ARCH),SunOS) +OS_LIBS = -lc +MAPFILE = $(OBJDIR)/pldsmap.sun +GARBAGE += $(MAPFILE) +ifdef NS_USE_GCC +ifdef GCC_USE_GNU_LD +MKSHLIB += -Wl,--version-script,$(MAPFILE) +else +MKSHLIB += -Wl,-M,$(MAPFILE) +endif +else +MKSHLIB += -M $(MAPFILE) +endif +endif + +ifeq ($(OS_ARCH),OS2) +MAPFILE = $(OBJDIR)/$(LIBRARY_NAME)$(LIBRARY_VERSION).def +GARBAGE += $(MAPFILE) +MKSHLIB += $(MAPFILE) +endif + EXTRA_LIBS = $(LIBNSPR) # On NCR and SCOOS, we can't link with extra libraries when @@ -113,7 +137,7 @@ NOW = $(MOD_DEPTH)/config/$(OBJDIR)/now SH_DATE = $(shell date "+%Y-%m-%d %T") SH_NOW = $(shell $(NOW)) -ifeq ($(OS_ARCH), WINNT) +ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) SUF = i64 else SUF = LL @@ -133,7 +157,7 @@ $(TINC): $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): plvrsion.c $(TINC) -ifeq ($(OS_ARCH), WINNT) +ifeq ($(NS_USE_GCC)_$(OS_ARCH),_WINNT) $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) $< else ifeq ($(MOZ_OS2_TOOLS), VACPP) |