diff options
| author | marha <marha@users.sourceforge.net> | 2010-04-30 13:46:01 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-04-30 13:46:01 +0000 |
| commit | 090430d67b3a7fb0aacc249b82428b7ea1424d70 (patch) | |
| tree | 8e6f9f0822fd3db2f39771a52041e1affa1bfcb9 /makefile.after | |
| parent | 3e05157bedacb9719dc5f4cc25a44c34396af0ac (diff) | |
| download | vcxsrv-090430d67b3a7fb0aacc249b82428b7ea1424d70.tar.gz vcxsrv-090430d67b3a7fb0aacc249b82428b7ea1424d70.tar.bz2 vcxsrv-090430d67b3a7fb0aacc249b82428b7ea1424d70.zip | |
Now default building is VS2010. VS2008 is still working.
Diffstat (limited to 'makefile.after')
| -rw-r--r-- | makefile.after | 12 |
1 files changed, 10 insertions, 2 deletions
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
|