diff options
| author | Steve Hay <SteveHay@planit.com> | 2009-02-03 17:56:38 +0000 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2009-02-03 17:56:38 +0000 |
| commit | 3ddd48aab497d12ecdb647e3011a07dc2cd3ed38 (patch) | |
| tree | 2dcc89def9868a160c7fe37b5f72b4cd7e27ff50 /win32 | |
| parent | 200cbd6aa595a0743f2aa115148750c075df3f97 (diff) | |
| download | perl-3ddd48aab497d12ecdb647e3011a07dc2cd3ed38.tar.gz | |
Oops. Missed these two files from commit 200cbd6aa595a0743f2aa115148750c075df3f97.
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 9 | ||||
| -rw-r--r-- | win32/makefile.mk | 9 |
2 files changed, 6 insertions, 12 deletions
diff --git a/win32/Makefile b/win32/Makefile index 75fab788ba..0812437cd1 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -383,16 +383,13 @@ DELAYLOAD = -DELAYLOAD:ws2_32.dll delayimp.lib # Visual C++ 2005 and 2008 (VC++ 8.x and 9.x) create manifest files for EXEs and # DLLs. These either need copying everywhere with the binaries, or else need -# embedding in them otherwise MSVCR80.dll or MSVCR90.dll won't be found. Embed -# them for simplicity, and delete them afterwards so that they don't get -# installed too. -!IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \ - "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" +# embedding in them otherwise MSVCR80.dll or MSVCR90.dll won't be found. For +# simplicity, embed them if they exist (and delete them afterwards so that they +# don't get installed too). EMBED_EXE_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1 && \ if exist $@.manifest del $@.manifest EMBED_DLL_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 && \ if exist $@.manifest del $@.manifest -!ENDIF ARCHDIR = ..\lib\$(ARCHNAME) COREDIR = ..\lib\CORE diff --git a/win32/makefile.mk b/win32/makefile.mk index bb1ab7879e..3b7b0b4a5d 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -382,16 +382,13 @@ DELAYLOAD *= -DELAYLOAD:ws2_32.dll delayimp.lib # Visual C++ 2005 and 2008 (VC++ 8.x and 9.x) create manifest files for EXEs and # DLLs. These either need copying everywhere with the binaries, or else need -# embedding in them otherwise MSVCR80.dll or MSVCR90.dll won't be found. Embed -# them for simplicity, and delete them afterwards so that they don't get -# installed too. -.IF "$(CCTYPE)" == "MSVC80" || "$(CCTYPE)" == "MSVC80FREE" || \ - "$(CCTYPE)" == "MSVC90" || "$(CCTYPE)" == "MSVC90FREE" +# embedding in them otherwise MSVCR80.dll or MSVCR90.dll won't be found. For +# simplicity, embed them if they exist (and delete them afterwards so that they +# don't get installed too). EMBED_EXE_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;1 && \ if exist $@.manifest del $@.manifest EMBED_DLL_MANI = if exist $@.manifest mt -nologo -manifest $@.manifest -outputresource:$@;2 && \ if exist $@.manifest del $@.manifest -.ENDIF ARCHDIR = ..\lib\$(ARCHNAME) COREDIR = ..\lib\CORE |