From bdaad687dc357c72172d2b1585dd764fe7398898 Mon Sep 17 00:00:00 2001
From: Mike DePaulo <mikedep333@gmail.com>
Date: Mon, 1 Sep 2014 12:41:18 -0400
Subject: Additional changes for XP targeting. From [1b493f] on the
 xp-fixesonly branch.

---
 makefile.after           | 276 +++++++++++++++++++++++------------------------
 openssl/util/pl/VC-32.pl |   8 +-
 2 files changed, 142 insertions(+), 142 deletions(-)

diff --git a/makefile.after b/makefile.after
index 41bac41fa..4ed6f5357 100644
--- a/makefile.after
+++ b/makefile.after
@@ -1,138 +1,138 @@
-OBJS+=$(CSRCS:%.c=$(OBJDIR)$/%$(OBJEXT))
-OBJS:=$(OBJS:%.cc=$(OBJDIR)$/%$(OBJEXT))
-
-RESOBJS:=$(RESOURCES:%.rc=$(OBJDIR)$/%.res)
-
-ifdef SUBDIRS
-load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)
-all: $(SUBDIRS:%=%\all)
-endif
-
-
-### Static library stuff ###
-ifdef LIBRARY
-LIBRARY_DIR := $(LIBRARY:%=$(OBJDIR)\%.lib)
-PDB := $(LIBRARY_DIR:%.lib=%.pdb)
-
-all: $(LIBRARY_DIR)
-
-$(LIBRARY_DIR) : $(OBJS)
-	$(AR) /OUT:$(relpath $@) $(OBJS)
-
-endif # End static library stuff
-
-ifdef SHAREDLIB
-DEFFILE ?= $(SHAREDLIB:%=%.def)
-LIBRARYS := $(SHAREDLIB:%=$(OBJDIR)\%.dll) $(SHAREDLIB:%=$(OBJDIR)\%.lib)
-PDB := $(SHAREDLIB:%=$(OBJDIR)\%.pdb)
-LINKFLAGS += /DLL /DEF:$(DEFFILE)
-
-all: $(LIBRARYS)
-
-$(LIBRARYS) : $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(DEFFILE)
-	$(LINK) $(LINKFLAGS) /OUT:$(relpath $(basename $@)).dll $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(OBJS)
-
-endif
-
-### WINAPP/TTYAPP stuff ###
-ifeq (1,$(call OR, $(call NE,$(WINAPP)_,_) $(call NE,$(TTYAPP)_,_)))
-
-ifdef WINAPP
-
-load_makefile $(MHMAKECONF)\libwinmain\makefile MAKESERVER=0 DEBUG=$(DEBUG)
-EXTRALIB := $(MHMAKECONF)\libwinmain\$(NOSERVOBJDIR)\libwinmain.lib
-
-EXE := $(WINAPP:%=$(OBJDIR)\%.exe)
-LINKFLAGS += /SUBSYSTEM:WINDOWS
-else
-EXE := $(TTYAPP:%=$(OBJDIR)\%.exe)
-LINKFLAGS += /SUBSYSTEM:CONSOLE
-endif
-
-PDB := $(EXE:%.exe=%.pdb)
-
-ifdef VS2008
-
-MANIFESTFILE:=$(OBJDIR)\runtime.manifest
-
-$(MANIFESTFILE):
-	$(MHMAKECONF)/tools/genruntimemanifest $@ $(DEBUG)
-
-endif
-
-all: $(EXE)
-
-$(EXE) :  $(OBJS) $(INCLUDELIBFILES) $(INCLUDENOSERVLIBFILES) $(RESOBJS) $(MANIFESTFILE) $(EXTRALIB)
-ifndef VS2008
-	$(LINK) $(LINKFLAGS) /MAP:$(EXE:%.exe=%.map) /OUT:$(relpath $@) $(INCLUDELIBFILES) $(INCLUDENOSERVLIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
-else
-	$(LINK) $(LINKFLAGS) /MANIFEST:NO /OUT:$(relpath $@) $(INCLUDELIBFILES) $(INCLUDENOSERVLIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
-	mt -nologo -manifest $(MANIFESTFILE) -outputresource:$(relpath $@);\#1
-endif
-
-endif  # End WINAPP or TTYAPP stuff
-
-ifeq ($(DEBUG),1)
-COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) -Fd"$(PDB)" $<
-else
-COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) -Fd"$(PDB)" $<
-#PDB=   # There is no PDB file generated in a release build
-endif
-
-ifndef CLEANRULEPOSTFIX
-ifeq ($(OBJDIRPREFIX),)
-ifeq ($(DEBUG),1)
-CLEANRULEPOSTFIX=debug
-else
-CLEANRULEPOSTFIX=release
-endif
-else
-CLEANRULEPOSTFIX=$(OBJDIRPREFIX)
-endif
-endif
-
-.PHONY: all cleanall clean clean$(CLEANRULEPOSTFIX)
-
-### Implicit rules ###
-CREATEDIR=mkdir $@
-
-$(OBJDIR) :
-	$(CREATEDIR)
-
-clean: clean$(CLEANRULEPOSTFIX)
-
-clean$(CLEANRULEPOSTFIX):
-	del -e $(OBJDIR)
-
-$(OBJDIR)\%$(OBJEXT) : %.c
-	$(CC) $(CCFLAGS) $(COMMONCFLAGS)
-
-$(OBJDIR)\%$(OBJEXT) : $(OBJDIR)\%.c
-	$(CC) $(CCFLAGS) $(COMMONCFLAGS)
-
-$(OBJDIR)\%$(OBJEXT) : %.cc
-	$(CC) $(CCFLAGS) /EHsc $(COMMONCFLAGS)
-
-$(OBJDIR)\%.res : %.rc
-	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<
-
-ifdef INC_BDF_RULES
-load_makefile $(MHMAKECONF)\bdftopcf\makefile MAKESERVER=0 DEBUG=$(DEBUG)
-load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
-
-#bdftopcf is dependent on zlib1.dll, so we need to add the directory of the zlib dll to the path env variable
-PATH:=$(relpath $(MHMAKECONF)\zlib\$(NOSERVOBJDIR))\;$(PATH)
-export PATH
-
-$(DESTDIR)\%.pcf.gz: %.bdf
-	@del -e $@
-	$(BDFTOPCF) -t $< | gzip > $@
-
-$(DESTDIR)\%.enc.gz: %.enc
-	gzip -c < $< > $@
-endif
-
-ifdef DESTDIR
-$(DESTDIR):
-	$(CREATEDIR)
-endif
+OBJS+=$(CSRCS:%.c=$(OBJDIR)$/%$(OBJEXT))
+OBJS:=$(OBJS:%.cc=$(OBJDIR)$/%$(OBJEXT))
+
+RESOBJS:=$(RESOURCES:%.rc=$(OBJDIR)$/%.res)
+
+ifdef SUBDIRS
+load_makefile $(SUBDIRS:%=%\makefile MAKESERVER=$(MAKESERVER) DEBUG=$(DEBUG);)
+all: $(SUBDIRS:%=%\all)
+endif
+
+
+### Static library stuff ###
+ifdef LIBRARY
+LIBRARY_DIR := $(LIBRARY:%=$(OBJDIR)\%.lib)
+PDB := $(LIBRARY_DIR:%.lib=%.pdb)
+
+all: $(LIBRARY_DIR)
+
+$(LIBRARY_DIR) : $(OBJS)
+	$(AR) /OUT:$(relpath $@) $(OBJS)
+
+endif # End static library stuff
+
+ifdef SHAREDLIB
+DEFFILE ?= $(SHAREDLIB:%=%.def)
+LIBRARYS := $(SHAREDLIB:%=$(OBJDIR)\%.dll) $(SHAREDLIB:%=$(OBJDIR)\%.lib)
+PDB := $(SHAREDLIB:%=$(OBJDIR)\%.pdb)
+LINKFLAGS += /DLL /DEF:$(DEFFILE)
+
+all: $(LIBRARYS)
+
+$(LIBRARYS) : $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(DEFFILE)
+	$(LINK) $(LINKFLAGS) /OUT:$(relpath $(basename $@)).dll $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(OBJS)
+
+endif
+
+### WINAPP/TTYAPP stuff ###
+ifeq (1,$(call OR, $(call NE,$(WINAPP)_,_) $(call NE,$(TTYAPP)_,_)))
+
+ifdef WINAPP
+
+load_makefile $(MHMAKECONF)\libwinmain\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+EXTRALIB := $(MHMAKECONF)\libwinmain\$(NOSERVOBJDIR)\libwinmain.lib
+
+EXE := $(WINAPP:%=$(OBJDIR)\%.exe)
+LINKFLAGS += /SUBSYSTEM:WINDOWS,5.01
+else
+EXE := $(TTYAPP:%=$(OBJDIR)\%.exe)
+LINKFLAGS += /SUBSYSTEM:CONSOLE,5.01
+endif
+
+PDB := $(EXE:%.exe=%.pdb)
+
+ifdef VS2008
+
+MANIFESTFILE:=$(OBJDIR)\runtime.manifest
+
+$(MANIFESTFILE):
+	$(MHMAKECONF)/tools/genruntimemanifest $@ $(DEBUG)
+
+endif
+
+all: $(EXE)
+
+$(EXE) :  $(OBJS) $(INCLUDELIBFILES) $(INCLUDENOSERVLIBFILES) $(RESOBJS) $(MANIFESTFILE) $(EXTRALIB)
+ifndef VS2008
+	$(LINK) $(LINKFLAGS) /MAP:$(EXE:%.exe=%.map) /OUT:$(relpath $@) $(INCLUDELIBFILES) $(INCLUDENOSERVLIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
+else
+	$(LINK) $(LINKFLAGS) /MANIFEST:NO /OUT:$(relpath $@) $(INCLUDELIBFILES) $(INCLUDENOSERVLIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS)
+	mt -nologo -manifest $(MANIFESTFILE) -outputresource:$(relpath $@);\#1
+endif
+
+endif  # End WINAPP or TTYAPP stuff
+
+ifeq ($(DEBUG),1)
+COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) -Fd"$(PDB)" $<
+else
+COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I%) -Fo$(relpath $@) -Fd"$(PDB)" $<
+#PDB=   # There is no PDB file generated in a release build
+endif
+
+ifndef CLEANRULEPOSTFIX
+ifeq ($(OBJDIRPREFIX),)
+ifeq ($(DEBUG),1)
+CLEANRULEPOSTFIX=debug
+else
+CLEANRULEPOSTFIX=release
+endif
+else
+CLEANRULEPOSTFIX=$(OBJDIRPREFIX)
+endif
+endif
+
+.PHONY: all cleanall clean clean$(CLEANRULEPOSTFIX)
+
+### Implicit rules ###
+CREATEDIR=mkdir $@
+
+$(OBJDIR) :
+	$(CREATEDIR)
+
+clean: clean$(CLEANRULEPOSTFIX)
+
+clean$(CLEANRULEPOSTFIX):
+	del -e $(OBJDIR)
+
+$(OBJDIR)\%$(OBJEXT) : %.c
+	$(CC) $(CCFLAGS) $(COMMONCFLAGS)
+
+$(OBJDIR)\%$(OBJEXT) : $(OBJDIR)\%.c
+	$(CC) $(CCFLAGS) $(COMMONCFLAGS)
+
+$(OBJDIR)\%$(OBJEXT) : %.cc
+	$(CC) $(CCFLAGS) /EHsc $(COMMONCFLAGS)
+
+$(OBJDIR)\%.res : %.rc
+	$(RC) $(RCFLAGS) $(RCDEFINES:%=-d "%") $(RCINCLUDES:%=-i %) -Fo$(relpath $@) $<
+
+ifdef INC_BDF_RULES
+load_makefile $(MHMAKECONF)\bdftopcf\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+load_makefile $(MHMAKECONF)\mkfontscale\makefile MAKESERVER=0 DEBUG=$(DEBUG)
+
+#bdftopcf is dependent on zlib1.dll, so we need to add the directory of the zlib dll to the path env variable
+PATH:=$(relpath $(MHMAKECONF)\zlib\$(NOSERVOBJDIR))\;$(PATH)
+export PATH
+
+$(DESTDIR)\%.pcf.gz: %.bdf
+	@del -e $@
+	$(BDFTOPCF) -t $< | gzip > $@
+
+$(DESTDIR)\%.enc.gz: %.enc
+	gzip -c < $< > $@
+endif
+
+ifdef DESTDIR
+$(DESTDIR):
+	$(CREATEDIR)
+endif
diff --git a/openssl/util/pl/VC-32.pl b/openssl/util/pl/VC-32.pl
index 78a49354e..eef39f5db 100755
--- a/openssl/util/pl/VC-32.pl
+++ b/openssl/util/pl/VC-32.pl
@@ -48,8 +48,8 @@ if ($FLAVOR =~ /WIN64/)
     my $f = ' /MD';
     $opt_cflags=$f.' /O2 /Ob2 /Oi /Ox /Oy /Ot /GL /Gy /GF /Zi';     
     $dbg_cflags=$f.'d /RTCc /RTC1 /Od /GS /GR /Gy /GF /Zi';   
-    $lflags="/NOLOGO /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG:STATUS";
-    $lflagsd="/NOLOGO /SUBSYSTEM:CONSOLE";
+    $lflags="/NOLOGO /SUBSYSTEM:CONSOLE,5.01 /OPT:REF /OPT:ICF /LTCG:STATUS";
+    $lflagsd="/NOLOGO /SUBSYSTEM:CONSOLE,5.01";
 
     *::perlasm_compile_target = sub {
 	my ($target,$source,$bname)=@_;
@@ -137,8 +137,8 @@ else	# Win32
     $ff = "/fixed";
     $opt_cflags=$f.' /O2 /Ob2 /Oi /Ox /Oy /Ot /GL /Gy /GF /Zi';     
     $dbg_cflags=$f.'d /RTCc /RTC1 /Od /GS /GR /Gy /GF /Zi';   
-    $lflags="/NOLOGO /SUBSYSTEM:CONSOLE /OPT:REF /OPT:ICF /LTCG:STATUS";
-    $lflagsd="/NOLOGO /SUBSYSTEM:CONSOLE";
+    $lflags="/NOLOGO /SUBSYSTEM:CONSOLE,5.01 /OPT:REF /OPT:ICF /LTCG:STATUS";
+    $lflagsd="/NOLOGO /SUBSYSTEM:CONSOLE,5.01";
     }
 $lib_cflag='/Zl' if (!$shlib);	# remove /DEFAULTLIBs from static lib
 $mlflags='';
-- 
cgit v1.2.3