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 --- xorg-server/makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'xorg-server/makefile') diff --git a/xorg-server/makefile b/xorg-server/makefile index 4416b6ddd..3391a1d77 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -55,7 +55,7 @@ load_makefile $(LIBDIRS:%$(OBJDIR)\=%makefile MAKESERVER=$(MAKESERVER) DEBUG=$(D OBJS = dix\$(OBJDIR)\main.obj -WINAPP=vcxsrv +TTYAPP=vcxsrv ifeq ($(DEBUG),1) LINKLIBS += $(MHMAKECONF)\openssl\out32_d\libeay32.lib \ @@ -74,12 +74,12 @@ XWin.rc: hw\xwin\XWin.rc RESOURCES = XWin.rc -$(OBJDIR)\$(WINAPP).exe: $(LINKLIBS) +$(OBJDIR)\$(TTYAPP).exe: $(LINKLIBS) XKeysymDB: ..\libX11\src\XKeysymDB copy $< $@ -$(WINAPP).exe: $(OBJDIR)\$(WINAPP).exe +$(TTYAPP).exe: $(OBJDIR)\$(TTYAPP).exe copy $< $@ load_makefile hw\xwin\xlaunch\makefile MAKESERVER=0 DEBUG=$(DEBUG) @@ -96,7 +96,7 @@ load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0 load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0 load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0 -all: $(WINAPP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB ..\libX11\nls\all fonts.src\all xkbdata.src\all +all: $(TTYAPP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB ..\libX11\nls\all fonts.src\all xkbdata.src\all protocol.txt: dix\protocol.txt copy $< $@ -- cgit v1.2.3