From efc84ef9fb92e95dfa3d1e7198ebca1b61cc4046 Mon Sep 17 00:00:00 2001 From: "srinivas%netscape.com" Date: Fri, 20 Nov 1998 20:17:20 +0000 Subject: [PATCH] Enable OS/2 builds with IBM's compiler (Visualage) and gcc port of OS/2 (emx). Checkin for Eric Olson and Henry . git-svn-id: svn://10.0.0.236/trunk@15040 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/nsprpub/config/OS2.mk | 2 +- mozilla/nsprpub/lib/libc/src/Makefile | 4 ++++ mozilla/nsprpub/pr/src/Makefile | 4 ++++ 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/mozilla/nsprpub/config/OS2.mk b/mozilla/nsprpub/config/OS2.mk index 5607f13f528..25e8725745d 100644 --- a/mozilla/nsprpub/config/OS2.mk +++ b/mozilla/nsprpub/config/OS2.mk @@ -122,7 +122,7 @@ endif OS_LIBS = -lsocket -lemxio -DEFINES += -DXP_OS2 -DXP_OS2_EMX -DOS2EMX_PLAIN_CHAR #-DHAVE_SIGNED_CHAR +DEFINES += -DXP_OS2 -DXP_OS2_EMX -DHAVE_SIGNED_CHAR OS_CFLAGS = $(OMF_FLAG) -Wall -Wno-unused -Zmtd OS_EXE_CFLAGS = $(OMF_FLAG) -Wall -Wno-unused -Zmtd diff --git a/mozilla/nsprpub/lib/libc/src/Makefile b/mozilla/nsprpub/lib/libc/src/Makefile index a0e2998c13a..a5b74d31a89 100644 --- a/mozilla/nsprpub/lib/libc/src/Makefile +++ b/mozilla/nsprpub/lib/libc/src/Makefile @@ -137,7 +137,11 @@ $(TINC): $(OBJDIR)/plvrsion.$(OBJ_SUFFIX): $(TINC) ifeq ($(OS_ARCH), WINNT) +ifdef XP_OS2_EMX + $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c +else $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c +endif else $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) plvrsion.c endif diff --git a/mozilla/nsprpub/pr/src/Makefile b/mozilla/nsprpub/pr/src/Makefile index 6957d35caff..6a9e9e412f0 100644 --- a/mozilla/nsprpub/pr/src/Makefile +++ b/mozilla/nsprpub/pr/src/Makefile @@ -341,7 +341,11 @@ $(TINC): $(OBJDIR)/prvrsion.$(OBJ_SUFFIX): $(TINC) ifeq ($(OS_ARCH), WINNT) +ifdef XP_OS2_EMX + $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) prvrsion.c +else $(CC) -Fo$@ -c $(CFLAGS) -I$(OBJDIR) prvrsion.c +endif else $(CC) -o $@ -c $(CFLAGS) -I$(OBJDIR) prvrsion.c endif