X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=win32%2Fmakefile.mk;h=bcb5e98010827358162e84d328091cb88c4fe807;hb=036c1c1eb70a0dfc5a7187959eb5e39d499c9396;hp=fd702a91a5097f0c2baf675e679fdb7bcd849a96;hpb=f48d5481c198305ec4f3a9c6868307cc1b9e2336;p=p5sagit%2Fp5-mst-13.2.git

diff --git a/win32/makefile.mk b/win32/makefile.mk
index fd702a9..bcb5e98 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -89,14 +89,11 @@ USE_LARGE_FILES *= define
 # Visual C++ > 2.x and < 6.x
 #CCTYPE		*= MSVC
 # Visual C++ >= 6.x
-CCTYPE		*= MSVC60
+#CCTYPE		*= MSVC60
 # Borland 5.02 or later
 #CCTYPE		*= BORLAND
-# mingw32+gcc-2.95.2 or better
-#CCTYPE		*= GCC
-# Uncomment this if you are using the latest MinGW release (2.0.0)
-# with gcc3.2
-#USE_GCC_V3_2	*= define
+# MinGW with gcc-2.95.2 or later
+CCTYPE		*= GCC
 
 #
 # uncomment this if your Borland compiler is older than v5.4.
@@ -293,7 +290,7 @@ ARCHNAME	!:= $(ARCHNAME)-thread
 
 # VC 6.0 can load the socket dll on demand.  Makes the test suite
 # run in about 10% less time.
-DELAYLOAD	*= -DELAYLOAD:wsock32.dll -DELAYLOAD:shell32.dll delayimp.lib
+DELAYLOAD	*= -DELAYLOAD:ws2_32.dll -DELAYLOAD:shell32.dll delayimp.lib
 
 .IF "$(CFG)" == "Debug"
 .ELSE
@@ -379,9 +376,6 @@ LINK_FLAGS	+= -L"$(CCLIBDIR)\Release"
 
 CC		= gcc
 LINK32		= g++
-.IF "$(USE_GCC_V3_2)" == "define"
-LINK32		= g++
-.END
 LIB32		= ar rc
 IMPLIB		= dlltool
 RSC		= windres
@@ -406,7 +400,7 @@ LIBC		= -lmsvcrt
 LIBFILES	= $(CRYPT_LIB) $(LIBC) \
 		  -lmoldname -lkernel32 -luser32 -lgdi32 \
 		  -lwinspool -lcomdlg32 -ladvapi32 -lshell32 -lole32 \
-		  -loleaut32 -lnetapi32 -luuid -lwsock32 -lmpr \
+		  -loleaut32 -lnetapi32 -luuid -lws2_32 -lmpr \
 		  -lwinmm -lversion -lodbc32
 
 .IF  "$(CFG)" == "Debug"
@@ -490,7 +484,7 @@ BUILDOPT	+= -DPERL_MSVCRT_READFIX
 LIBBASEFILES	= $(CRYPT_LIB) \
 		oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib \
 		comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \
-		netapi32.lib uuid.lib wsock32.lib mpr.lib winmm.lib \
+		netapi32.lib uuid.lib ws2_32.lib mpr.lib winmm.lib \
 		version.lib
 
 # win64 doesn't have some libs