diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-30 21:13:06 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1998-05-30 21:13:06 +0000 |
| commit | af883608f6139035400fd724f833e61e4ed8c1b6 (patch) | |
| tree | 4e46a8053a916dd02af9110636700a7b037b9ec5 /win32 | |
| parent | 9e5a0491dfd6742194347115bac72d779c95ac13 (diff) | |
| download | perl-af883608f6139035400fd724f833e61e4ed8c1b6.tar.gz | |
[win32] change#1060 was inexplicably missing some of the "ensure
AS stuff does no harm" fixes
p4raw-link: @1060 on //depot/win32/perl: 26ca90b622247714396690e385249f8ca1417aa0
p4raw-id: //depot/win32/perl@1065
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 16 | ||||
| -rw-r--r-- | win32/makefile.mk | 16 |
2 files changed, 10 insertions, 22 deletions
diff --git a/win32/Makefile b/win32/Makefile index 16ea34d283..aa86afcf8f 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -114,15 +114,8 @@ LIB32 = $(LINK32) -lib # # Options # -!IF "$(OBJECT)" == "-DPERL_OBJECT" -RUNTIME = -MT -# XXX building with -MD fails many tests, but cannot investigate -# because building with debug crashes compiler :-( GSAR )-: -#RUNTIME = -MD -!ELSE -RUNTIME = -MD -!ENDIF +RUNTIME = -MD INCLUDES = -I.\include -I. -I.. #PCHFLAGS = -Fpc:\temp\vcmoduls.pch -YX DEFINES = -DWIN32 -D_CONSOLE $(BUILDOPT) $(CRYPT_FLAG) @@ -145,9 +138,9 @@ OPTIMIZE = -Od $(RUNTIME)d -Zi -D_DEBUG -DDEBUGGING LINK_DBG = -debug -pdb:none !ELSE ! IF "$(CCTYPE)" == "MSVC20" -OPTIMIZE = -O2 $(RUNTIME) -DNDEBUG +OPTIMIZE = -Od $(RUNTIME) -DNDEBUG ! ELSE -OPTIMIZE = -O2 $(RUNTIME) -DNDEBUG +OPTIMIZE = -Od $(RUNTIME) -DNDEBUG ! ENDIF LINK_DBG = -release !ENDIF @@ -357,7 +350,7 @@ WIN32_OBJ = $(WIN32_SRC:.c=.obj) MINICORE_OBJ = $(CORE_OBJ:..\=.\mini\) $(MINIDIR)\miniperlmain$(o) MINIWIN32_OBJ = $(WIN32_OBJ:.\=.\mini\) MINI_OBJ = $(MINICORE_OBJ) $(MINIWIN32_OBJ) -PERL95_OBJ = $(PERL95_SRC:.c=.obj) DynaLoadmt$(o) +PERL95_OBJ = $(PERL95_SRC:.c=.obj) DLL_OBJ = $(DLL_SRC:.c=.obj) X2P_OBJ = $(X2P_SRC:.c=.obj) @@ -372,6 +365,7 @@ PERLEXE_OBJ = perlmain$(o) PERLDLL_OBJ = $(PERLDLL_OBJ) $(WIN32_OBJ) $(DLL_OBJ) !ELSE PERLEXE_OBJ = $(PERLEXE_OBJ) $(WIN32_OBJ) $(DLL_OBJ) +PERL95_OBJ = $(PERL95_OBJ) DynaLoadmt$(o) !ENDIF DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B diff --git a/win32/makefile.mk b/win32/makefile.mk index ab67c7365d..ec7226e3ce 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -199,15 +199,8 @@ LIB32 = $(LINK32) -lib # # Options # -.IF "$(OBJECT)" == "-DPERL_OBJECT" -RUNTIME = -MT -# XXX building with -MD fails many tests, but cannot investigate -# because building with debug crashes compiler :-( GSAR )-: -#RUNTIME = -MD -.ELSE -RUNTIME = -MD -.ENDIF +RUNTIME = -MD INCLUDES = -I.\include -I. -I.. #PCHFLAGS = -Fpc:\temp\vcmoduls.pch -YX DEFINES = -DWIN32 -D_CONSOLE $(BUILDOPT) $(CRYPT_FLAG) @@ -230,9 +223,9 @@ OPTIMIZE = -Od $(RUNTIME)d -Zi -D_DEBUG -DDEBUGGING LINK_DBG = -debug -pdb:none .ELSE .IF "$(CCTYPE)" == "MSVC20" -OPTIMIZE = -O2 $(RUNTIME) -DNDEBUG +OPTIMIZE = -Od $(RUNTIME) -DNDEBUG .ELSE -OPTIMIZE = -O2 $(RUNTIME) -DNDEBUG +OPTIMIZE = -Od $(RUNTIME) -DNDEBUG .ENDIF LINK_DBG = -release .ENDIF @@ -467,7 +460,7 @@ WIN32_OBJ = $(WIN32_SRC:db:+$(o)) MINICORE_OBJ = $(MINIDIR)\{$(CORE_OBJ:f) miniperlmain$(o)} MINIWIN32_OBJ = $(MINIDIR)\{$(WIN32_OBJ:f)} MINI_OBJ = $(MINICORE_OBJ) $(MINIWIN32_OBJ) -PERL95_OBJ = $(PERL95_SRC:db:+$(o)) DynaLoadmt$(o) +PERL95_OBJ = $(PERL95_SRC:db:+$(o)) DLL_OBJ = $(DLL_SRC:db:+$(o)) X2P_OBJ = $(X2P_SRC:db:+$(o)) @@ -482,6 +475,7 @@ PERLEXE_OBJ = perlmain$(o) PERLDLL_OBJ += $(WIN32_OBJ) $(DLL_OBJ) .ELSE PERLEXE_OBJ += $(WIN32_OBJ) $(DLL_OBJ) +PERL95_OBJ += DynaLoadmt$(o) .ENDIF DYNAMIC_EXT = Socket IO Fcntl Opcode SDBM_File POSIX attrs Thread B |