From 9f1e5316f34fad3e7d0d1af2f2f3102359cef488 Mon Sep 17 00:00:00 2001 From: marha Date: Tue, 18 Jan 2011 16:39:34 +0000 Subject: Added xclock application files --- xorg-server/installer/vcxsrv.nsi | 2 ++ xorg-server/makefile | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index 9ee2eabad..93ccfaf0d 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -239,6 +239,8 @@ Section "Uninstall" Delete "$INSTDIR\xcalc" Delete "$INSTDIR\xcalc-color" Delete "$INSTDIR\xclock.exe" + Delete "$INSTDIR\xclock" + Delete "$INSTDIR\xclock-color" Delete "$INSTDIR\xwininfo.exe" Delete "$INSTDIR\XKeysymDB" Delete "$INSTDIR\XErrorDB" diff --git a/xorg-server/makefile b/xorg-server/makefile index be5748d3f..a7b931a16 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -105,8 +105,11 @@ load_makefile ..\apps\xcalc\makefile MAKESERVER=0 DEBUG=0 xcalc.exe: ..\apps\xcalc\obj\release\xcalc.exe XCalc XCalc-color copy $< $@ +%: ..\apps\xclock\app-defaults\% + copy $< $@ + load_makefile ..\apps\xclock\makefile MAKESERVER=0 DEBUG=0 -xclock.exe: ..\apps\xclock\obj\release\xclock.exe +xclock.exe: ..\apps\xclock\obj\release\xclock.exe XClock XClock-color copy $< $@ load_makefile ..\apps\xwininfo\makefile MAKESERVER=0 DEBUG=0 -- cgit v1.2.3