summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsrinivas%netscape.com <devnull@localhost>1998-11-20 20:17:20 +0000
committersrinivas%netscape.com <devnull@localhost>1998-11-20 20:17:20 +0000
commitdf8a8c6d6d15c2a5a3fd44e3d15932039062d78e (patch)
tree61709763531af3fa123a35aa4e908805156d8978
parent835f732be8132114e524b064df0766811f5e49c5 (diff)
downloadnspr-hg-df8a8c6d6d15c2a5a3fd44e3d15932039062d78e.tar.gz
Enable OS/2 builds with IBM's compiler (Visualage) and gcc port of OS/2 (emx).
Checkin for Eric Olson <Eric.Olson@Sympatico.CA> and Henry <sobotka@axess.com>.
-rw-r--r--config/OS2.mk2
-rw-r--r--lib/libc/src/Makefile4
-rw-r--r--pr/src/Makefile4
3 files changed, 9 insertions, 1 deletions
diff --git a/config/OS2.mk b/config/OS2.mk
index 5607f13f..25e87257 100644
--- a/config/OS2.mk
+++ b/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/lib/libc/src/Makefile b/lib/libc/src/Makefile
index a0e2998c..a5b74d31 100644
--- a/lib/libc/src/Makefile
+++ b/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/pr/src/Makefile b/pr/src/Makefile
index 6957d35c..6a9e9e41 100644
--- a/pr/src/Makefile
+++ b/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