summaryrefslogtreecommitdiff
path: root/win32/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'win32/Makefile')
-rw-r--r--win32/Makefile25
1 files changed, 22 insertions, 3 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 9e4437f853..7a98f84c2c 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -201,6 +201,11 @@ WIN32_OBJ = win32.obj \
win32io.obj \
win32sck.obj
+PERL95_OBJ = perl95.obj \
+ win32mt.obj \
+ win32iomt.obj \
+ win32sckmt.obj
+
DLL_OBJ = perllib.obj $(DYNALOADER).obj
CORE_H = ..\av.h \
@@ -356,9 +361,15 @@ perl95.obj : perl95.c
win32iomt.obj : win32io.c
$(CC) $(CFLAGS) -MT -c $(OBJOUT_FLAG)win32iomt.obj win32io.c
-$(PERL95EXE): $(PERLDLL) $(CONFIGPM) perl95.obj win32iomt.obj
+win32sckmt.obj : win32sck.c
+ $(CC) $(CFLAGS) -MT -c $(OBJOUT_FLAG)win32sckmt.obj win32sck.c
+
+win32mt.obj : win32.c
+ $(CC) $(CFLAGS) -MT -c $(OBJOUT_FLAG)win32mt.obj win32.c
+
+$(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ)
$(LINK32) -subsystem:console -out:perl95.exe $(LINK_FLAGS) \
- perl95.obj win32iomt.obj $(PERLIMPLIB)
+ $(PERL95_OBJ) $(PERLIMPLIB)
copy perl95.exe $@
del perl95.exe
@@ -469,10 +480,18 @@ minitest : $(MINIPERL) $(GLOBEXE) $(CONFIGPM)
$(MINIPERL) -I..\lib test base/*.t comp/*.t cmd/*.t io/*.t op/*.t pragma/*.t
cd ..\win32
-test : all
+test-prep : all
$(XCOPY) $(PERLEXE) ..\t\$(NULL)
$(XCOPY) $(PERLDLL) ..\t\$(NULL)
$(XCOPY) $(GLOBEXE) ..\t\$(NULL)
+
+test : test-prep
+ cd ..\t
+ $(PERLEXE) -I..\lib harness
+ cd ..\win32
+
+test-notty : test-prep
+ set PERL_SKIP_TTY_TEST=1
cd ..\t
$(PERLEXE) -I..\lib harness
cd ..\win32