diff options
Diffstat (limited to 'win32/Makefile')
| -rw-r--r-- | win32/Makefile | 32 |
1 files changed, 4 insertions, 28 deletions
diff --git a/win32/Makefile b/win32/Makefile index c60a61de5d..b1680cb82a 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -133,20 +133,6 @@ CCTYPE = MSVC60 #USE_SETARGV = define # -# if you want to have the crypt() builtin function implemented, leave this or -# CRYPT_LIB uncommented. The fcrypt.c file named here contains a suitable -# version of des_fcrypt(). -# -CRYPT_SRC = fcrypt.c - -# -# if you didn't set CRYPT_SRC and if you have des_fcrypt() available in a -# library, uncomment this, and make sure the library exists (see README.win32) -# Specify the full pathname of the library. -# -#CRYPT_LIB = fcrypt.lib - -# # set this if you wish to use perl's malloc # WARNING: Turning this on/off WILL break binary compatibility with extensions # you may have compiled with/without it. Be prepared to recompile all @@ -237,13 +223,6 @@ EXTRALIBDIRS = ##################### CHANGE THESE ONLY IF YOU MUST ##################### -!IF "$(CRYPT_SRC)$(CRYPT_LIB)" == "" -D_CRYPT = undef -!ELSE -D_CRYPT = define -CRYPT_FLAG = -DHAVE_DES_FCRYPT -!ENDIF - !IF "$(USE_IMP_SYS)" == "define" PERL_MALLOC = undef DEBUG_MSTATS = undef @@ -414,7 +393,7 @@ RSC = rc INCLUDES = -I$(COREDIR) -I.\include -I. -I.. #PCHFLAGS = -Fpc:\temp\vcmoduls.pch -YX -DEFINES = -DWIN32 -D_CONSOLE -DNO_STRICT $(CRYPT_FLAG) +DEFINES = -DWIN32 -D_CONSOLE -DNO_STRICT LOCDEFS = -DPERLDLL -DPERL_CORE SUBSYS = console CXX_FLAG = -TP -EHsc @@ -473,7 +452,7 @@ BUILDOPT = $(BUILDOPT) -D_USE_32BIT_TIME_T ! ENDIF !ENDIF -LIBBASEFILES = $(CRYPT_LIB) \ +LIBBASEFILES = \ oldnames.lib kernel32.lib user32.lib gdi32.lib winspool.lib \ comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib \ netapi32.lib uuid.lib ws2_32.lib mpr.lib winmm.lib \ @@ -688,7 +667,8 @@ EXTRACORE_SRC = $(EXTRACORE_SRC) ..\perlio.c WIN32_SRC = \ .\win32.c \ .\win32sck.c \ - .\win32thread.c + .\win32thread.c \ + .\fcrypt.c # We need this for miniperl build unless we override canned # config.h #define building mini\* @@ -696,9 +676,6 @@ WIN32_SRC = \ WIN32_SRC = $(WIN32_SRC) .\win32io.c #!ENDIF -!IF "$(CRYPT_SRC)" != "" -WIN32_SRC = $(WIN32_SRC) .\$(CRYPT_SRC) -!ENDIF X2P_SRC = \ ..\x2p\a2p.c \ @@ -798,7 +775,6 @@ CFG_VARS = \ "ld=$(LINK32)" \ "ccflags=$(EXTRACFLAGS) $(OPTIMIZE:"=\") $(DEFINES) $(BUILDOPT)" \ "cf_email=$(EMAIL)" \ - "d_crypt=$(D_CRYPT)" \ "d_mymalloc=$(PERL_MALLOC)" \ "libs=$(LIBFILES)" \ "incpath=$(CCINCDIR:"=\")" \ |