diff options
| author | Gurusamy Sarathy <gsar@cpan.org> | 1997-11-10 04:47:48 +0000 |
|---|---|---|
| committer | Gurusamy Sarathy <gsar@cpan.org> | 1997-11-10 04:47:48 +0000 |
| commit | 32f822de0a58c2cc8f1a23844b97246c433bb418 (patch) | |
| tree | bb14d9cc2fae0de70fa5f10dd4bc34c4fbde26e6 /win32/makefile.mk | |
| parent | d55594aef6b1fb9e305275c3d19a25e4cdfb2cda (diff) | |
| download | perl-32f822de0a58c2cc8f1a23844b97246c433bb418.tar.gz | |
Win32 branch now contains all non-ansification changes in ansiperl branch.
USE_THREADS case builds and passes all tests using both compilers.
Additional tweaks:
- fixup win32/makedef.pl to skip more symbols for non-thread build.
- sync win32/Makefile with win32/makefile.mk
>>>Non-thread build fails a lot of tests.<<<
p4raw-id: //depot/win32/perl@222
Diffstat (limited to 'win32/makefile.mk')
| -rw-r--r-- | win32/makefile.mk | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/win32/makefile.mk b/win32/makefile.mk index 655efb7395..3dc00a215a 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -96,7 +96,7 @@ RUNTIME = -MD .ENDIF INCLUDES = -I.\include -I. -I.. #PCHFLAGS = -Fp$(INTDIR)\vcmoduls.pch -YX -DEFINES = -DWIN32 $(BUILDOPT) -D_CONSOLE -D_WIN32_WINNT=0x400 +DEFINES = -DWIN32 -D_CONSOLE $(BUILDOPT) LOCDEFS = -DPERLDLL SUBSYS = console @@ -131,7 +131,7 @@ LIBFILES = oldnames.lib kernel32.lib user32.lib gdi32.lib \ version.lib odbc32.lib odbccp32.lib CFLAGS = -nologo -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) $(PCHFLAGS) $(OPTIMIZE) -LINK_FLAGS = -nologo $(LIBFILES) $(LINK_DBG) -machine:I386 +LINK_FLAGS = -nologo $(LIBFILES) $(LINK_DBG) -machine:$(PROCESSOR_ARCHITECTURE) OBJOUT_FLAG = -Fo .ENDIF @@ -315,7 +315,6 @@ CORE_H = ..\av.h \ .\include\sys\socket.h \ .\win32.h - EXTENSIONS=DynaLoader Socket IO Fcntl Opcode SDBM_File attrs Thread DYNALOADER=$(EXTDIR)\DynaLoader\DynaLoader @@ -601,7 +600,7 @@ minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM) cd ..\t && \ $(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t -test : all +test-prep : all $(XCOPY) $(PERLEXE) ..\t\$(NULL) $(XCOPY) $(PERLDLL) ..\t\$(NULL) .IF "$(CCTYPE)" == "BORLAND" @@ -609,8 +608,14 @@ test : all .ELSE $(XCOPY) $(GLOBEXE) ..\t\$(NULL) .ENDIF + +test : test-prep cd ..\t && $(PERLEXE) -I..\lib harness +test-notty : test-prep + set PERL_SKIP_TTY_TEST=1 && \ + cd ..\t && $(PERLEXE) -I.\lib harness + clean : -@erase miniperlmain.obj -@erase $(MINIPERL) |