diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2004-03-08 10:43:23 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@gmail.com> | 2004-03-08 10:43:23 +0000 |
| commit | 3890b58f2a8ab2020dbd2032fc23d546361bb215 (patch) | |
| tree | 83d98f2ad31cbb31f2131fd9601b10c2eba4be3e /win32 | |
| parent | 0b96339f066406ec3091aa3edc23d79475da8df5 (diff) | |
| download | perl-3890b58f2a8ab2020dbd2032fc23d546361bb215.tar.gz | |
Another makefile portability fix for Win32 by Steve Hay.
p4raw-id: //depot/perl@22467
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 8 | ||||
| -rw-r--r-- | win32/makefile.mk | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/win32/Makefile b/win32/Makefile index 198d69da8b..f99a01a6a3 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -349,10 +349,6 @@ LIBC = msvcrt.lib LIBC = PerlCRT.lib !ENDIF -PERLEXE_ICO = perlexe.ico -PERLEXE_RES = perlexe.res -PERLDLL_RES = - !IF "$(CFG)" == "Debug" ! IF "$(CCTYPE)" == "MSVC20" OPTIMIZE = -Od -MD -Z7 -DDEBUGGING @@ -448,6 +444,10 @@ CONFIGPM = ..\lib\Config.pm MINIMOD = ..\lib\ExtUtils\Miniperl.pm X2P = ..\x2p\a2p.exe +PERLEXE_ICO = .\perlexe.ico +PERLEXE_RES = .\perlexe.res +PERLDLL_RES = + # Nominate a target which causes extensions to be re-built # This used to be $(PERLEXE), but at worst it is the .dll that they depend # on and really only the interface - i.e. the .def file used to export symbols diff --git a/win32/makefile.mk b/win32/makefile.mk index a0eb3cd9b9..e89b472b5b 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -450,10 +450,6 @@ LIBC = msvcrt.lib LIBC = PerlCRT.lib .ENDIF -PERLEXE_ICO = .\perlexe.ico -PERLEXE_RES = .\perlexe.res -PERLDLL_RES = - .IF "$(CFG)" == "Debug" .IF "$(CCTYPE)" == "MSVC20" OPTIMIZE = -Od -MD -Z7 -DDEBUGGING @@ -571,6 +567,10 @@ CONFIGPM = ..\lib\Config.pm MINIMOD = ..\lib\ExtUtils\Miniperl.pm X2P = ..\x2p\a2p.exe +PERLEXE_ICO = .\perlexe.ico +PERLEXE_RES = .\perlexe.res +PERLDLL_RES = + # Nominate a target which causes extensions to be re-built # This used to be $(PERLEXE), but at worst it is the .dll that they depend # on and really only the interface - i.e. the .def file used to export symbols |