diff options
| author | Steve Hay <steve.m.hay@googlemail.com> | 2010-11-18 10:46:01 +0000 |
|---|---|---|
| committer | Steve Hay <steve.m.hay@googlemail.com> | 2010-11-18 10:46:41 +0000 |
| commit | 2a46176fce26ca9f48e1c970c01e133149ab2d91 (patch) | |
| tree | 8da08f48859b49124dc07e0c90a0be02347e0da4 /win32/Makefile | |
| parent | 8c8488cd4fce90cb5c03fb3f89e89c05e5275498 (diff) | |
| download | perl-2a46176fce26ca9f48e1c970c01e133149ab2d91.tar.gz | |
Support Visual C++ 2010
Also add a couple of things to win32/makefile.mk which were only previously
applied to win32/Makefile
Diffstat (limited to 'win32/Makefile')
| -rw-r--r-- | win32/Makefile | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/win32/Makefile b/win32/Makefile index d55330cc9c..0c1ac8e28f 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -111,6 +111,10 @@ CCTYPE = MSVC60 #CCTYPE = MSVC90FREE # Visual C++ 2008 (aka Visual C++ 9.x) (full version) #CCTYPE = MSVC90 +# Visual C++ 2010 Express Edition (aka Visual C++ 10.x) (free version) +#CCTYPE = MSVC100FREE +# Visual C++ 2010 (aka Visual C++ 10.x) (full version) +#CCTYPE = MSVC100 # # uncomment next line if you want debug version of perl (big,slow) @@ -355,13 +359,14 @@ BUILDOPT = $(BUILDOPT) -DUSE_PERLIO ARCHNAME = $(ARCHNAME)-thread !ENDIF -# Visual C++ 98, .NET 2003, 2005 and 2008 specific. -# VC++ 6.x, 7.x, 8.x and 9.x can load DLL's on demand. Makes the test suite run +# Visual C++ 98, .NET 2003, 2005/2008/2010 specific. +# VC++ 6/7/8/9/10.x can load DLLs on demand. Makes the test suite run # in about 10% less time. (The free version of 7.x can't do this, but the free -# versions of 8.x and 9.x can.) +# versions of 8/9/10.x can.) !IF "$(CCTYPE)" == "MSVC60" || "$(CCTYPE)" == "MSVC70" || \ "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \ - "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" + "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" || \ + "$(CCTYPE)" == "MSVC100" || "$(CCTYPE)" == "MSVC100FREE" DELAYLOAD = -DELAYLOAD:ws2_32.dll delayimp.lib !ENDIF @@ -445,10 +450,11 @@ DEFINES = $(DEFINES) -DWIN64 -DCONSERVATIVE OPTIMIZE = $(OPTIMIZE) -fp:precise !ENDIF -# For now, silence VC++ 8.x's and 9.x's warnings about "unsafe" CRT functions +# For now, silence VC++ 8/9/10.x's warnings about "unsafe" CRT functions # and POSIX CRT function names being deprecated. !IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \ - "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" + "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" || \ + "$(CCTYPE)" == "MSVC100" || "$(CCTYPE)" == "MSVC100FREE" DEFINES = $(DEFINES) -D_CRT_SECURE_NO_DEPRECATE -D_CRT_NONSTDC_NO_DEPRECATE !ENDIF @@ -504,7 +510,8 @@ EXEOUT_FLAG = -Fe CFLAGS_O = $(CFLAGS) $(BUILDOPT) !IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \ - "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" + "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" || \ + "$(CCTYPE)" == "MSVC100" || "$(CCTYPE)" == "MSVC100FREE" LINK_FLAGS = $(LINK_FLAGS) "/manifestdependency:type='Win32' name='Microsoft.Windows.Common-Controls' version='6.0.0.0' processorArchitecture='*' publicKeyToken='6595b64144ccf1df' language='*'" !ELSE RSC_FLAGS = -DINCLUDE_MANIFEST |