From 090430d67b3a7fb0aacc249b82428b7ea1424d70 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 30 Apr 2010 13:46:01 +0000 Subject: Now default building is VS2010. VS2008 is still working. --- makefile.after | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'makefile.after') diff --git a/makefile.after b/makefile.after index 32cfc2a56..1fe4e08bd 100644 --- a/makefile.after +++ b/makefile.after @@ -38,16 +38,24 @@ endif PDB := $(EXE:%.exe=%.pdb) -MANIFESTFILE:=$(OBJDIR)\runtime.manifest +ifdef VS2008 -all: $(EXE) +MANIFESTFILE:=$(OBJDIR)\runtime.manifest $(MANIFESTFILE): $(MHMAKECONF)/tools/genruntimemanifest $@ $(DEBUG) +endif + +all: $(EXE) + $(EXE) : $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(MANIFESTFILE) $(EXTRALIB) +ifndef VS2008 + $(LINK) $(LINKFLAGS) /OUT:$(relpath $@) $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS) +else $(LINK) $(LINKFLAGS) /MANIFEST:NO /OUT:$(relpath $@) $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(EXTRALIB) $(OBJS) $(RESOBJS) mt -nologo -manifest $(MANIFESTFILE) -outputresource:$(relpath $@);\#1 +endif endif # End WINAPP or TTYAPP stuff -- cgit v1.2.3