diff options
| author | law <devnull@localhost> | 1998-04-09 20:33:23 +0000 |
|---|---|---|
| committer | law <devnull@localhost> | 1998-04-09 20:33:23 +0000 |
| commit | d76f98c4d2bacdc5037e56a3bd47ebe3dda1188e (patch) | |
| tree | 8a815f460e741b01b186284b24c5472c365bc1fa | |
| parent | 99970ae5d194d881e9ed8054a7e9256655a4f60f (diff) | |
| download | nspr-hg-d76f98c4d2bacdc5037e56a3bd47ebe3dda1188e.tar.gz | |
Warpzilla April09 patchesWarpzilla
| -rw-r--r-- | config/OS2.mk | 8 | ||||
| -rw-r--r-- | config/rules.mk | 4 | ||||
| -rw-r--r-- | pr/src/Makefile | 6 |
3 files changed, 11 insertions, 7 deletions
diff --git a/config/OS2.mk b/config/OS2.mk index 260392c8..948df41c 100644 --- a/config/OS2.mk +++ b/config/OS2.mk @@ -40,8 +40,8 @@ SHELL = GBASH.EXE CC = icc -q -DXP_OS2 -N10 CCC = icc -q -DXP_OS2 -DOS2=4 -N10 -LINK = flipper ilink -AR = ilibo /noignorecase /nologo $@ +LINK = ilink +AR = ilib /noignorecase /nologo $(subst /,\\,$@) RANLIB = @echo RANLIB BSDECHO = @echo BSDECHO NSINSTALL = nsinstall @@ -95,6 +95,8 @@ OS_DLLFLAGS = -nologo -DLL -FREE -NOE ifdef XP_OS2_VACPP +OS_LIBS = so32dll.lib tcp32dll.lib + DEFINES += -DXP_OS2_VACPP else @@ -107,6 +109,8 @@ RC = rc.exe FILTER = emxexp IMPLIB = emximp -o +OS_LIBS = -lsocket -lemxio + LIB_SUFFIX = a DEFINES += -DXP_OS2_EMX diff --git a/config/rules.mk b/config/rules.mk index fccec649..017927b6 100644 --- a/config/rules.mk +++ b/config/rules.mk @@ -233,7 +233,11 @@ endif $(LIBRARY): $(OBJS) @$(MAKE_OBJDIR) rm -f $@ +ifdef XP_OS2_VACPP + $(AR) $(subst /,\\,$(OBJS)) $(AR_EXTRA_ARGS) +else $(AR) $(OBJS) $(AR_EXTRA_ARGS) +endif $(RANLIB) $@ ifeq ($(OS_TARGET), WIN16) diff --git a/pr/src/Makefile b/pr/src/Makefile index b1f58e38..6e9ab996 100644 --- a/pr/src/Makefile +++ b/pr/src/Makefile @@ -131,11 +131,7 @@ endif ifeq ($(OS_ARCH),WINNT) ifeq ($(OS_TARGET),OS2) -ifdef XP_OS2_VACPP -OS_LIBS = so32dll.lib tcp32dll.lib -else -OS_LIBS = -lsocket -lemxio -endif +# We define this in os2.mk. else ifneq ($(OS_TARGET),WIN16) OS_LIBS = wsock32.lib winmm.lib |