aboutsummaryrefslogtreecommitdiff
path: root/xorg-server
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-08-07 12:33:59 +0000
committermarha <marha@users.sourceforge.net>2009-08-07 12:33:59 +0000
commite7e9a66629ada359ad6a35cdb12e0e35b49e889c (patch)
treea93f38125aee1970e8a41bd23f4abc9162deeaee /xorg-server
parent527d85e0327133858ddb86169f2840f305c192b3 (diff)
downloadvcxsrv-e7e9a66629ada359ad6a35cdb12e0e35b49e889c.tar.gz
vcxsrv-e7e9a66629ada359ad6a35cdb12e0e35b49e889c.tar.bz2
vcxsrv-e7e9a66629ada359ad6a35cdb12e0e35b49e889c.zip
Added plink tool (version without console, except if output is generated)
Added possibility to build console application or windows application in makefile.after
Diffstat (limited to 'xorg-server')
-rw-r--r--xorg-server/fonts.src/font-util/makefile2
-rw-r--r--xorg-server/installer/vcxsrv.nsi1
-rw-r--r--xorg-server/makefile8
3 files changed, 6 insertions, 5 deletions
diff --git a/xorg-server/fonts.src/font-util/makefile b/xorg-server/fonts.src/font-util/makefile
index bc3218f18..13e196a03 100644
--- a/xorg-server/fonts.src/font-util/makefile
+++ b/xorg-server/fonts.src/font-util/makefile
@@ -1,4 +1,4 @@
-WINAPP = ucs2any
+TTYAPP = ucs2any
CSRCS = ucs2any.c
diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi
index dcaaf8f83..da7069b7d 100644
--- a/xorg-server/installer/vcxsrv.nsi
+++ b/xorg-server/installer/vcxsrv.nsi
@@ -62,6 +62,7 @@ Section "VcXsrv (required)"
File "..\..\xkbcomp\obj\release\xkbcomp.exe"
File "..\xkeysymdb"
File "..\hw\xwin\xlaunch\obj\release\xlaunch.exe"
+ File "..\..\tools\plink\obj\release\plink.exe""
SetOutPath $INSTDIR\fonts
File /r "..\fonts\*.*"
SetOutPath $INSTDIR\xkbdata
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 $< $@