Warpzilla April09 patches OS2_BRANCH Warpzilla
authorlaw
Thu, 09 Apr 1998 20:33:23 +0000
branchOS2_BRANCH
changeset 21 5577eb3c4bc52e8aba099ff7fcefec5bcfe99130
parent 17 a79ab89f65ead5f5741cfbe9f0c0150548bb4f89
child 40 b6b3f939b6ccf8abdfcb36a59b2ce09d7a40df6e
push idunknown
push userunknown
push dateunknown
Warpzilla April09 patches
config/OS2.mk
config/rules.mk
pr/src/Makefile
--- a/config/OS2.mk
+++ b/config/OS2.mk
@@ -35,18 +35,18 @@ endif
 
 #
 # On OS/2 we proudly support gbash...
 #
 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
 INSTALL	= $(NSINSTALL)
 MAKE_OBJDIR = if test ! -d $(OBJDIR); then mkdir $(OBJDIR); fi
 IMPLIB = implib -nologo -noignorecase
 FILTER = cppfilt -b -p -q
 RC = rc.exe
@@ -90,28 +90,32 @@ endif
 else
 OBJDIR_NAME = $(OS_CONFIG)$(CPU_ARCH)$(OBJDIR_TAG).OBJ
 endif
 
 OS_DLLFLAGS = -nologo -DLL -FREE -NOE
 
 ifdef XP_OS2_VACPP
 
+OS_LIBS = so32dll.lib tcp32dll.lib
+
 DEFINES += -DXP_OS2_VACPP
 
 else
 
 CC		= gcc
 CCC		= gcc
 LINK	= gcc
 AR      = ar -q $@
 RC 		= rc.exe
 FILTER  = emxexp
 IMPLIB  = emximp -o
 
+OS_LIBS     = -lsocket -lemxio
+
 LIB_SUFFIX = a
 
 DEFINES += -DXP_OS2_EMX
 
 ifdef BUILD_OPT
 OPTIMIZER	= -O3
 DLLFLAGS	= 
 EXEFLAGS    =
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -228,17 +228,21 @@ ifeq ($(OS_ARCH),WINNT)
 	$(CC) $(OBJS) -Fe$@ -link $(LDFLAGS) $(OS_LIBS) $(EXTRA_LIBS)
 else
 	$(CC) -o $@ $(CFLAGS) $(OBJS) $(LDFLAGS)
 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)
 $(IMPORT_LIBRARY): $(SHARED_LIBRARY)
 	wlib $(OS_LIB_FLAGS) $@ +$(SHARED_LIBRARY)
 endif
 
 ifeq ($(OS_TARGET), OS2)
--- a/pr/src/Makefile
+++ b/pr/src/Makefile
@@ -126,21 +126,17 @@ OS_LIBS		= -lsocket -lc
 endif
 
 ifeq ($(OS_ARCH),NEWS-OS)
 OS_LIBS		= -lsocket -lnsl -lgen -lresolv
 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
 endif
 endif
 endif
 
 #