diff options
Diffstat (limited to 'win32/Makefile')
| -rw-r--r-- | win32/Makefile | 29 |
1 files changed, 17 insertions, 12 deletions
diff --git a/win32/Makefile b/win32/Makefile index f700ada1b9..9dd104edd7 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -223,8 +223,22 @@ CFG = Optimize !ENDIF !ENDIF +ARCHDIR = ..\lib\$(ARCHNAME) COREDIR = ..\lib\CORE AUTODIR = ..\lib\auto +LIBDIR = ..\lib +EXTDIR = ..\ext +PODDIR = ..\pod +EXTUTILSDIR = $(LIBDIR)\ExtUtils + +# +INST_SCRIPT = $(INST_TOP)$(INST_VER)\bin +INST_BIN = $(INST_SCRIPT)$(INST_ARCH) +INST_LIB = $(INST_TOP)$(INST_VER)\lib +INST_ARCHLIB = $(INST_LIB)$(INST_ARCH) +INST_COREDIR = $(INST_ARCHLIB)\CORE +INST_POD = $(INST_LIB)\pod +INST_HTML = $(INST_POD)\html # # Programs to compile, build .lib files and link @@ -300,7 +314,9 @@ LIBFILES = $(LIBBASEFILES) $(LIBC) CFLAGS = -nologo -Gf -W3 $(INCLUDES) $(DEFINES) $(LOCDEFS) \ $(PCHFLAGS) $(OPTIMIZE) -LINK_FLAGS = -nologo -nodefaultlib $(LINK_DBG) -machine:$(PROCESSOR_ARCHITECTURE) +LINK_FLAGS = -nologo -nodefaultlib $(LINK_DBG) \ + -libpath:"$(INST_COREDIR)" \ + -machine:$(PROCESSOR_ARCHITECTURE) OBJOUT_FLAG = -Fo EXEOUT_FLAG = -Fe @@ -328,17 +344,6 @@ $(o).dll: -out:$@ $(LINK_FLAGS) $(LIBFILES) $< $(LIBPERL) # -INST_BIN = $(INST_TOP)$(INST_VER)\bin$(INST_ARCH) -INST_SCRIPT = $(INST_TOP)$(INST_VER)\bin -INST_LIB = $(INST_TOP)$(INST_VER)\lib -INST_POD = $(INST_LIB)\pod -INST_HTML = $(INST_POD)\html -LIBDIR = ..\lib -EXTDIR = ..\ext -PODDIR = ..\pod -EXTUTILSDIR = $(LIBDIR)\extutils - -# # various targets !IF "$(USE_OBJECT)" == "define" PERLIMPLIB = ..\perl56.lib |