more exported symbols needed for build on windows

[p5sagit/p5-mst-13.2.git] / win32 / Makefile

diff --git a/win32/Makefile b/win32/Makefile
index 2a00255..e4f3d86 100644 (file)
--- a/win32/Makefile
+++ b/win32/Makefile
@@ -107,7 +107,6 @@ INST_ARCH   = \$(ARCHNAME)
 # Not recommended if you have VC 6.x and you're not running Windows 9x.
 #
 #USE_PERLCRT   = define
-#BUILD_FOR_WIN95    = define
 
 #
 # uncomment to enable linking with setargv.obj under the Visual C
@@ -482,10 +481,6 @@ MAKE               = nmake -nologo
 CFGSH_TMPL     = config.vc
 CFGH_TMPL      = config_H.vc
 
-!IF "$(BUILD_FOR_WIN95)" == "define"
-PERL95EXE      = ..\perl95.exe
-!ENDIF
-
 XCOPY          = xcopy /f /r /i /d
 RCOPY          = xcopy /f /r /i /e /d
 NOOP           = @echo
@@ -549,15 +544,6 @@ WIN32_SRC  = $(WIN32_SRC) .\win32thread.c
 WIN32_SRC      = $(WIN32_SRC) .\$(CRYPT_SRC)
 !ENDIF
 
-PERL95_SRC     =               \
-               perl95.c        \
-               win32mt.c       \
-               win32sckmt.c
-
-!IF "$(CRYPT_SRC)" != ""
-PERL95_SRC     = $(PERL95_SRC) .\$(CRYPT_SRC)
-!ENDIF
-
 DLL_SRC                = $(DYNALOADER).c
 
 X2P_SRC                =               \
@@ -620,7 +606,6 @@ MINICORE_OBJ        = $(MICROCORE_OBJ:..\=.\mini\)  \
                  $(MINIDIR)\perlio$(o)
 MINIWIN32_OBJ  = $(WIN32_OBJ:.\=.\mini\)
 MINI_OBJ       = $(MINICORE_OBJ) $(MINIWIN32_OBJ)
-PERL95_OBJ     = $(PERL95_SRC:.c=.obj)
 DLL_OBJ                = $(DLL_SRC:.c=.obj)
 X2P_OBJ                = $(X2P_SRC:.c=.obj)
 
@@ -629,7 +614,6 @@ PERLEXE_OBJ = perlmain$(o)
 
 PERLDLL_OBJ    = $(PERLDLL_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
 #PERLEXE_OBJ   = $(PERLEXE_OBJ) $(WIN32_OBJ) $(DLL_OBJ)
-#PERL95_OBJ    = $(PERL95_OBJ) DynaLoadmt$(o)
 
 !IF "$(USE_SETARGV)" != ""
 SETARGV_OBJ    = setargv$(o)
@@ -749,7 +733,7 @@ CFG_VARS    =                                       \
 # Top targets
 #
 
-all : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(PERLEXE) $(PERL95EXE) \
+all : .\config.h $(GLOBEXE) $(MINIMOD) $(CONFIGPM) $(PERLEXE) \
        $(X2P) $(EXTENSION_DLL) $(EXTENSION_PM)
 
 $(DYNALOADER)$(o) : $(DYNALOADER).c $(CORE_H) $(EXTDIR)\DynaLoader\dlutils.c
@@ -823,7 +807,6 @@ $(MINI_OBJ) : $(CORE_NOCFG_H)
 $(WIN32_OBJ)   : $(CORE_H)
 $(CORE_OBJ)    : $(CORE_H)
 $(DLL_OBJ)     : $(CORE_H)
-$(PERL95_OBJ)  : $(CORE_H)
 $(X2P_OBJ)     : $(CORE_H)
 
 perldll.def : $(MINIPERL) $(CONFIGPM) ..\global.sym ..\pp.sym ..\makedef.pl
@@ -875,33 +858,6 @@ $(PERLEXE): $(PERLDLL) $(CONFIGPM) $(PERLEXE_OBJ) $(PERLEXE_RES)
        copy splittree.pl .. 
        $(MINIPERL) -I..\lib ..\splittree.pl "../LIB" $(AUTODIR)
 
-!IF "$(BUILD_FOR_WIN95)" == "define"
-
-perl95.c : runperl.c 
-       copy runperl.c perl95.c
-
-perl95$(o) : perl95.c
-       $(CC) $(CFLAGS_O) -MT -UPERLDLL -DWIN95FIX -c perl95.c
-
-win32sckmt$(o) : win32sck.c
-       $(CC) $(CFLAGS_O) -MT -UPERLDLL -DWIN95FIX -c \
-           $(OBJOUT_FLAG)win32sckmt$(o) win32sck.c
-
-win32mt$(o) : win32.c
-       $(CC) $(CFLAGS_O) -MT -UPERLDLL -DWIN95FIX -c \
-           $(OBJOUT_FLAG)win32mt$(o) win32.c
-
-DynaLoadmt$(o) : $(DYNALOADER).c
-       $(CC) $(CFLAGS_O) -MT -UPERLDLL -DWIN95FIX -c \
-           $(OBJOUT_FLAG)DynaLoadmt$(o) $(DYNALOADER).c
-
-$(PERL95EXE): $(PERLDLL) $(CONFIGPM) $(PERL95_OBJ)
-       $(LINK32) -subsystem:console -nodefaultlib -out:$@ $(LINK_FLAGS) \
-           $(LIBBASEFILES) $(PERL95_OBJ) $(SETARGV_OBJ) $(PERLIMPLIB) \
-           libcmt.lib
-
-!ENDIF
-
 $(DYNALOADER).c: $(MINIPERL) $(EXTDIR)\DynaLoader\dl_win32.xs $(CONFIGPM)
        if not exist $(AUTODIR) mkdir $(AUTODIR)
        cd $(EXTDIR)\$(*B)
@@ -1028,7 +984,7 @@ utils: $(PERLEXE) $(X2P)
        $(PERLEXE) $(PL2BAT) $(UTILS)
 
 distclean: clean
-       -del /f $(MINIPERL) $(PERLEXE) $(PERL95EXE) $(PERLDLL) $(GLOBEXE) \
+       -del /f $(MINIPERL) $(PERLEXE) $(PERLDLL) $(GLOBEXE) \
                $(PERLIMPLIB) ..\miniperl.lib $(MINIMOD)
        -del /f *.def *.map
        -del /f $(EXTENSION_DLL) $(EXTENSION_PM)
@@ -1059,7 +1015,6 @@ distclean: clean
        cd ..\win32
        -del /f ..\config.sh ..\splittree.pl perlmain.c dlutils.c config.h.new
        -del /f $(CONFIGPM)
-       -del /f perl95.c
        -del /f bin\*.bat
        cd $(EXTDIR)
        -del /s *.lib *.def *.map *.pdb *.bs Makefile *$(o) pm_to_blib
@@ -1071,9 +1026,6 @@ install : all installbare installhtml
 
 installbare : utils
        $(PERLEXE) ..\installperl
-!IF "$(BUILD_FOR_WIN95)" == "define"
-       $(XCOPY) $(PERL95EXE) $(INST_BIN)\*.*
-!ENDIF
        if exist $(WPERLEXE) $(XCOPY) $(WPERLEXE) $(INST_BIN)\*.*
        $(XCOPY) $(GLOBEXE) $(INST_BIN)\*.*
        $(XCOPY) bin\*.bat $(INST_SCRIPT)\*.*