diff options
| author | wtc%google.com <devnull@localhost> | 2010-07-23 01:39:16 +0000 |
|---|---|---|
| committer | wtc%google.com <devnull@localhost> | 2010-07-23 01:39:16 +0000 |
| commit | 49ddd9b414e6747f186f87cdaab8285af584efb0 (patch) | |
| tree | ad1ab3a665c4035373aaad7aba69efe828e3d21c /lib/tests | |
| parent | 8a1d39c76bd91c0ec1f3d53adaa4e0ebf42d5181 (diff) | |
| download | nspr-hg-49ddd9b414e6747f186f87cdaab8285af584efb0.tar.gz | |
Bug 547064: build nsprpub/lib/tests for Windows Mobile. The patch is
contributed by Brad Lassey <blassey@mozilla.com>. r=wtc.
Diffstat (limited to 'lib/tests')
| -rw-r--r-- | lib/tests/Makefile.in | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lib/tests/Makefile.in b/lib/tests/Makefile.in index d96a2d5a..7acb5e86 100644 --- a/lib/tests/Makefile.in +++ b/lib/tests/Makefile.in @@ -52,11 +52,11 @@ CSRCS = \ getopt.c \ string.c -ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) +ifeq (,$(filter-out WINCE WINNT OS2,$(OS_ARCH))) CSRCS += arena.c endif -ifeq (,$(filter-out WINNT OS2,$(OS_ARCH))) +ifeq (,$(filter-out WINCE WINNT OS2,$(OS_ARCH))) PROG_SUFFIX = .exe else PROG_SUFFIX = @@ -75,9 +75,9 @@ LIBPR = -lnspr$(MOD_MAJOR_VERSION) LIBPLC = -lplc$(MOD_MAJOR_VERSION) LIBPLDS = -lplds$(MOD_MAJOR_VERSION) -ifeq ($(OS_ARCH), WINNT) +ifeq (,$(filter-out WINCE WINNT, $(OS_ARCH))) LDOPTS = -NOLOGO -DEBUG -INCREMENTAL:NO - ifeq ($(OS_TARGET), WIN95) + ifeq (,$(filter-out WIN95 WINCE WINMO, $(OS_TARGET))) LIBPR = $(dist_libdir)/nspr$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) LIBPLC= $(dist_libdir)/plc$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) LIBPLDS= $(dist_libdir)/plds$(MOD_MAJOR_VERSION).$(LIB_SUFFIX) @@ -206,6 +206,9 @@ $(OBJDIR)/%$(PROG_SUFFIX): $(OBJDIR)/%.$(OBJ_SUFFIX) ifeq ($(OS_ARCH), WINNT) link $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) wsock32.lib -out:$@ else +ifeq ($(OS_ARCH), WINCE) + $(LD) $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) ws2.lib -out:$@ +else ifeq ($(OS_ARCH),OS2) $(LINK) $(EXEFLAGS) $(LDOPTS) $< $(LIBPLC) $(LIBPLDS) $(LIBPR) $(OS_LIBS) $(EXTRA_LIBS) else @@ -213,6 +216,7 @@ else endif endif endif +endif export:: $(TARGETS) clean:: |