IO::Socket now sets $!, avoids eval/die (patch from Graham Barr

[p5sagit/p5-mst-13.2.git] / win32 / makefile.mk

diff --git a/win32/makefile.mk b/win32/makefile.mk
index fd5733f..6357300 100644 (file)
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -99,9 +99,9 @@ INST_ARCH     *= \$(ARCHNAME)
 # Visual C++ >= 6.x
 #CCTYPE                *= MSVC60
 # Borland 5.02 or later
-CCTYPE         *= BORLAND
-# mingw32/gcc-2.95.2 or better
-#CCTYPE                *= GCC
+#CCTYPE                *= BORLAND
+# mingw32+gcc-2.95.2 or better
+CCTYPE         *= GCC
 
 #
 # uncomment this if you are compiling under Windows 95/98 and command.com
@@ -165,9 +165,9 @@ CCTYPE              *= BORLAND
 # so you may have to set CCHOME explicitly (spaces in the path name should
 # not be quoted)
 #
-CCHOME         *= c:\bc5
+#CCHOME                *= c:\bc5
 #CCHOME                *= $(MSVCDIR)
-#CCHOME                *= D:\packages\mingw32
+CCHOME         *= c:\gcc-2.95.2-msvcrt
 CCINCDIR       *= $(CCHOME)\include
 CCLIBDIR       *= $(CCHOME)\lib
 
@@ -288,8 +288,8 @@ ARCHNAME    = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi
 ARCHNAME       = MSWin32-$(PROCESSOR_ARCHITECTURE)
 .ENDIF
 
-.IF "$(USE_OBJECT)" == "define"
-ARCHNAME       = $(ARCHNAME)-thread
+.IF "$(USE_ITHREADS)" == "define"
+ARCHNAME       !:= $(ARCHNAME)-thread
 .ENDIF
 
 # Visual Studio 98 specific
@@ -409,6 +409,9 @@ OBJOUT_FLAG = -o
 EXEOUT_FLAG    = -o
 LIBOUT_FLAG    = 
 
+# NOTE: we assume that GCC uses MSVCRT.DLL
+BUILDOPT       += -fno-strict-aliasing -DPERL_MSVCRT_READFIX
+
 .ELSE
 
 CC             = cl
@@ -591,11 +594,7 @@ CFGH_TMPL  = config_H.bc
 
 CFGSH_TMPL     = config.gc
 CFGH_TMPL      = config_H.gc
-.IF "$(USE_OBJECT)" == "define"
-PERLIMPLIB     = ..\libperlcore$(a)
-.ELSE
-PERLIMPLIB     = ..\libperl$(a)
-.ENDIF
+PERLIMPLIB     = ..\libperl56$(a)
 
 .ELSE