diff options
| author | Nicholas Clark <nick@ccl4.org> | 2009-09-23 16:20:37 +0100 |
|---|---|---|
| committer | Nicholas Clark <nick@ccl4.org> | 2009-09-23 16:20:37 +0100 |
| commit | c1effa61278e47c916466883d74905b04fedc388 (patch) | |
| tree | fc1924881953a43ab6eef59e7bdc122a6d3f0c54 /win32 | |
| parent | d7f84378c13a9837fe0c62fb453daaf10ca81abf (diff) | |
| download | perl-c1effa61278e47c916466883d74905b04fedc388.tar.gz | |
Following b0e687f7 Win32 requires an -I..\lib for makedef.pl and x2p\*.PL
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 6 | ||||
| -rw-r--r-- | win32/makefile.mk | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/win32/Makefile b/win32/Makefile index 8be691ac29..431b9374e8 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -943,7 +943,7 @@ $(X2P_OBJ) : $(CORE_H) perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl create_perllibst_h.pl $(MINIPERL) -I..\lib create_perllibst_h.pl - $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \ + $(MINIPERL) -I..\lib -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) $(BUILDOPT) \ CCTYPE=$(CCTYPE) > perldll.def $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static @@ -982,8 +982,8 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\walk.c $(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions - $(MINIPERL) ..\x2p\find2perl.PL - $(MINIPERL) ..\x2p\s2p.PL + $(MINIPERL) -I..\lib ..\x2p\find2perl.PL + $(MINIPERL) -I..\lib ..\x2p\s2p.PL $(LINK32) -subsystem:console -out:$@ @<< $(LINK_FLAGS) $(LIBFILES) $(X2P_OBJ) << diff --git a/win32/makefile.mk b/win32/makefile.mk index 38b89d971e..2bb2014b44 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -1210,7 +1210,7 @@ $(X2P_OBJ) : $(CORE_H) perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl create_perllibst_h.pl $(MINIPERL) -I..\lib create_perllibst_h.pl - $(MINIPERL) -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) \ + $(MINIPERL) -I..\lib -w ..\makedef.pl PLATFORM=win32 $(OPTIMIZE) $(DEFINES) \ $(BUILDOPT) CCTYPE=$(CCTYPE) > perldll.def $(PERLDLL): perldll.def $(PERLDLL_OBJ) $(PERLDLL_RES) Extensions_static @@ -1283,8 +1283,8 @@ $(MINIMOD) : $(MINIPERL) ..\minimod.pl $(CC) -I..\x2p $(CFLAGS) $(OBJOUT_FLAG)$@ -c ..\x2p\walk.c $(X2P) : $(MINIPERL) $(X2P_OBJ) Extensions - $(MINIPERL) ..\x2p\find2perl.PL - $(MINIPERL) ..\x2p\s2p.PL + $(MINIPERL) -I..\lib ..\x2p\find2perl.PL + $(MINIPERL) -I..\lib ..\x2p\s2p.PL .IF "$(CCTYPE)" == "BORLAND" $(LINK32) -Tpe -ap $(BLINK_FLAGS) \ @$(mktmp c0x32$(o) $(X2P_OBJ),$@,,$(LIBFILES),) |