From: Gurusamy Sarathy <gsar@cpan.org>
Date: Thu, 28 May 1998 02:06:47 +0000 (+0000)
Subject: [asperl] tweaks to enable Borland build
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=064a70d4cb44455257b8caebe159b9d93a8f9025;p=p5sagit%2Fp5-mst-13.2.git

[asperl] tweaks to enable Borland build

p4raw-id: //depot/asperl@1040
---

diff --git a/win32/makefile.mk b/win32/makefile.mk
index b557cdf..e482742 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -119,7 +119,7 @@ AUTODIR		= ..\lib\auto
 
 CC		= bcc32
 LINK32		= tlink32
-LIB32		= tlib
+LIB32		= tlib /P128
 IMPLIB		= implib -c
 
 #
@@ -149,12 +149,13 @@ CFLAGS		= -w -d -tWM -tWD $(INCLUDES) $(DEFINES) $(LOCDEFS) \
 LINK_FLAGS	= $(LINK_DBG) -L$(CCLIBDIR)
 OBJOUT_FLAG	= -o
 EXEOUT_FLAG	= -e
+LIBOUT_FLAG	= 
 
 .ELIF "$(CCTYPE)" == "GCC"
 
 CC		= gcc -pipe
 LINK32		= gcc -pipe
-LIB32		= ar
+LIB32		= ar rc
 IMPLIB		= dlltool
 
 o = .o
@@ -185,6 +186,7 @@ CFLAGS		= $(INCLUDES) $(DEFINES) $(LOCDEFS) $(OPTIMIZE)
 LINK_FLAGS	= $(LINK_DBG) -L$(CCLIBDIR)
 OBJOUT_FLAG	= -o
 EXEOUT_FLAG	= -o
+LIBOUT_FLAG	= 
 
 .ELSE
 
@@ -244,6 +246,7 @@ CFLAGS		= -nologo -Gf -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \
 LINK_FLAGS	= -nologo $(LINK_DBG) -machine:$(PROCESSOR_ARCHITECTURE)
 OBJOUT_FLAG	= -Fo
 EXEOUT_FLAG	= -Fe
+LIBOUT_FLAG	= /out:
 
 .ENDIF
 
@@ -755,17 +758,29 @@ $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
 	cd $(EXTDIR)\$(*B) && $(XSUBPP) dl_win32.xs > $(*B).c
 	$(XCOPY) $(EXTDIR)\$(*B)\dlutils.c .
 
-!IF "$(OBJECT)" == "-DPERL_OBJECT"
+.IF "$(OBJECT)" == "-DPERL_OBJECT"
+
 PerlCAPI.cpp : $(MINIPERL)
 	$(MINIPERL) GenCAPI.pl $(COREDIR)
 
 PerlCAPI$(o) : PerlCAPI.cpp
+.IF "$(CCTYPE)" == "BORLAND"
+	$(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
+.ELIF "$(CCTYPE)" == "GCC"
+	$(CC) $(CFLAGS_O) -c $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
+.ELSE
 	$(CC) $(CFLAGS_O) -MT -UPERLDLL -DWIN95FIX -c \
 	    $(OBJOUT_FLAG)PerlCAPI$(o) PerlCAPI.cpp
+.ENDIF
 
 $(CAPILIB) : PerlCAPI.cpp PerlCAPI$(o)
-	lib /OUT:$(CAPILIB) PerlCAPI$(o)
-!ENDIF
+.IF "$(CCTYPE)" == "BORLAND"
+	$(LIB32) $(LIBOUT_FLAG)$(CAPILIB) +PerlCAPI$(o)
+.ELSE
+	$(LIB32) $(LIBOUT_FLAG)$(CAPILIB) PerlCAPI$(o)
+.ENDIF
+
+.ENDIF
 
 $(EXTDIR)\DynaLoader\dl_win32.xs: dl_win32.xs
 	copy dl_win32.xs $(EXTDIR)\DynaLoader\dl_win32.xs
diff --git a/win32/win32.c b/win32/win32.c
index 56a462a..21da843 100644
--- a/win32/win32.c
+++ b/win32/win32.c
@@ -1202,10 +1202,6 @@ win32_crypt(const char *txt, const char *salt)
 }
 #endif
 
-#ifdef _M_IX86
-#define USE_FIXED_OSFHANDLE
-#endif
-
 #ifdef USE_FIXED_OSFHANDLE
 
 EXTERN_C int __cdecl _alloc_osfhnd(void);