From e7e9a66629ada359ad6a35cdb12e0e35b49e889c Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 7 Aug 2009 12:33:59 +0000 Subject: Added plink tool (version without console, except if output is generated) Added possibility to build console application or windows application in makefile.after --- makefile.after | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'makefile.after') diff --git a/makefile.after b/makefile.after index 18b1d6f25..5324decca 100644 --- a/makefile.after +++ b/makefile.after @@ -21,12 +21,18 @@ $(LIBRARY_DIR) : $(OBJS) endif # End static library stuff -### WINAPP stuff ### +### WINAPP/TTYAPP stuff ### +ifeq (1,$(call OR, $(call NE,$(WINAPP)_,_) $(call NE,$(TTYAPP)_,_))) + ifdef WINAPP EXE := $(WINAPP:%=$(OBJDIR)\%.exe) -PDB := $(EXE:%.exe=%.pdb) +LINKFLAGS += /SUBSYSTEM:WINDOWS +else +EXE := $(TTYAPP:%=$(OBJDIR)\%.exe) +LINKFLAGS += /SUBSYSTEM:CONSOLE +endif -#LINKFLAGS += /SUBSYSTEM:WINDOWS +PDB := $(EXE:%.exe=%.pdb) MANIFESTFILE:=$(OBJDIR)\runtime.manifest @@ -39,7 +45,7 @@ $(EXE) : $(OBJS) $(INCLUDELIBFILES) $(RESOBJS) $(MANIFESTFILE) $(LINK) $(LINKFLAGS) /MANIFEST:NO /OUT:$(relpath $@) $(INCLUDELIBFILES) $(SYSTEMLIBS) $(LINKLIBS) $(OBJS) $(RESOBJS) mt -nologo -manifest $(MANIFESTFILE) -outputresource:$(relpath $@);\#1 -endif # End WINAPP stuff +endif # End WINAPP or TTYAPP stuff ifeq ($(DEBUG),1) COMMONCFLAGS += $(DEFINES:%=-D%) $(INCLUDES:%=-I"%") -Fo"$(relpath $@)" -Fd"$(PDB)" "$<" -- cgit v1.2.3