diff options
| author | srinivas%netscape.com <devnull@localhost> | 2000-01-10 21:08:45 +0000 |
|---|---|---|
| committer | srinivas%netscape.com <devnull@localhost> | 2000-01-10 21:08:45 +0000 |
| commit | 694a6d2b62f2d6a42c8983ddbe4549255b778e65 (patch) | |
| tree | 88e555b19dfbe38747fd424e3fc24a36d448f859 /lib/tests | |
| parent | 9f4864cbf70f2839d272775ef6c8d64536cd3417 (diff) | |
| download | nspr-hg-694a6d2b62f2d6a42c8983ddbe4549255b778e65.tar.gz | |
Update to OS/2 port; the build now uses OS_ARCH=OS2, in place of WINNT.
Checkin for sobotka@axess.com. Bugzilla 23544.
Diffstat (limited to 'lib/tests')
| -rw-r--r-- | lib/tests/Makefile | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/lib/tests/Makefile b/lib/tests/Makefile index e1c9e8b9..5cafffa3 100644 --- a/lib/tests/Makefile +++ b/lib/tests/Makefile @@ -34,7 +34,11 @@ CSRCS = \ event.c \ base64t.c -ifeq ($(OS_ARCH), WINNT) +ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) +CSRCS += arena.c +endif + +ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) PROG_SUFFIX = .exe else PROG_SUFFIX = @@ -72,6 +76,17 @@ else endif endif +ifeq ($(OS_ARCH),OS2) + ifeq ($(MOZ_OS2_TOOLS),VACPP) + LDOPTS = -NOE -DEBUG -nologo -PMTYPE:VIO /S:32768 + LIBPR = $(DIST)/lib/nspr$(MOD_VERSION).lib + LIBPLC = $(DIST)/lib/plc$(MOD_VERSION).lib + LIBPLDS= $(DIST)/lib/plds$(MOD_VERSION).$(LIB_SUFFIX) + else + LDOPTS += -Zomf -Zlinker /PM:VIO + endif +endif + ifneq ($(OS_ARCH), WINNT) PWD = $(shell pwd) endif @@ -203,9 +218,12 @@ else link $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) wsock32.lib -out:$@ endif else +ifeq ($(OS_ARCH),OS2) + $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) +else $(CC) $(XCFLAGS) $< $(LDOPTS) $(LIBPLC) $(LIBPLDS) $(LIBPR) $(EXTRA_LIBS) -o $@ endif - +endif endif export:: $(TARGETS) |