summaryrefslogtreecommitdiff
path: root/win32
diff options
context:
space:
mode:
authorMattia Barbon <mbarbon@dsi.unive.it>2001-09-11 01:38:46 +0200
committerJarkko Hietaniemi <jhi@iki.fi>2001-09-10 23:31:45 +0000
commite9524bf795bb136b2c861d6daf12315a94b9486f (patch)
treee1d93b4f139f9a11bc5c4f6c5f046e7a38dcace8 /win32
parenta7d982deea81935a4bac277be207317ca3f69c40 (diff)
downloadperl-e9524bf795bb136b2c861d6daf12315a94b9486f.tar.gz
Building on win32 w/o perlio
Message-ID: <3B9D4F06.14433.2C37644@localhost> p4raw-id: //depot/perl@11989
Diffstat (limited to 'win32')
-rw-r--r--win32/Makefile7
-rw-r--r--win32/makefile.mk7
2 files changed, 10 insertions, 4 deletions
diff --git a/win32/Makefile b/win32/Makefile
index 0287a189f1..93f8cb238e 100644
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -508,10 +508,13 @@ EXTRACORE_SRC = $(EXTRACORE_SRC) ..\perlio.c
WIN32_SRC = \
.\win32.c \
- .\win32io.c \
.\win32sck.c \
.\win32thread.c
+!IF "$(USE_PERLIO)" == "define"
+WIN32_SRC = $(WIN32_SRC) .\win32io.c
+!ENDIF
+
!IF "$(CRYPT_SRC)" != ""
WIN32_SRC = $(WIN32_SRC) .\$(CRYPT_SRC)
!ENDIF
@@ -574,7 +577,7 @@ WIN32_OBJ = $(WIN32_SRC:.c=.obj)
MINICORE_OBJ = $(MICROCORE_OBJ:..\=.\mini\) \
$(MINIDIR)\miniperlmain$(o) \
$(MINIDIR)\perlio$(o)
-MINIWIN32_OBJ = $(WIN32_OBJ:.\=.\mini\)
+MINIWIN32_OBJ = $(WIN32_OBJ:.\=.\mini\) $(MINIDIR)\win32io$(o)
MINI_OBJ = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
DLL_OBJ = $(DLL_SRC:.c=.obj)
X2P_OBJ = $(X2P_SRC:.c=.obj)
diff --git a/win32/makefile.mk b/win32/makefile.mk
index 0b4b685c6d..63db4761f3 100644
--- a/win32/makefile.mk
+++ b/win32/makefile.mk
@@ -664,10 +664,13 @@ EXTRACORE_SRC += ..\perlio.c
WIN32_SRC = \
.\win32.c \
- .\win32io.c \
.\win32sck.c \
.\win32thread.c
+.IF "$(USE_PERLIO)" == "define"
+WIN32_SRC += .\win32io.c
+.ENDIF
+
.IF "$(CRYPT_SRC)" != ""
WIN32_SRC += .\$(CRYPT_SRC)
.ENDIF
@@ -728,7 +731,7 @@ MICROCORE_OBJ = $(MICROCORE_SRC:db:+$(o))
CORE_OBJ = $(MICROCORE_OBJ) $(EXTRACORE_SRC:db:+$(o))
WIN32_OBJ = $(WIN32_SRC:db:+$(o))
MINICORE_OBJ = $(MINIDIR)\{$(MICROCORE_OBJ:f) miniperlmain$(o) perlio$(o)}
-MINIWIN32_OBJ = $(MINIDIR)\{$(WIN32_OBJ:f)}
+MINIWIN32_OBJ = $(MINIDIR)\{$(WIN32_OBJ:f)} $(MINIDIR)\win32io$(o)
MINI_OBJ = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
DLL_OBJ = $(DLL_SRC:db:+$(o))
X2P_OBJ = $(X2P_SRC:db:+$(o))