aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-01-18 16:39:34 +0000
committermarha <marha@users.sourceforge.net>2011-01-18 16:39:34 +0000
commit9f1e5316f34fad3e7d0d1af2f2f3102359cef488 (patch)
treed132d24aa64438576fb5bc8694dd42732425b8fe
parentbd6df75c18714c1d819adb07cc425cf74355a2a2 (diff)
downloadvcxsrv-9f1e5316f34fad3e7d0d1af2f2f3102359cef488.tar.gz
vcxsrv-9f1e5316f34fad3e7d0d1af2f2f3102359cef488.tar.bz2
vcxsrv-9f1e5316f34fad3e7d0d1af2f2f3102359cef488.zip
Added xclock application files
-rw-r--r--xorg-server/installer/vcxsrv.nsi2
-rw-r--r--xorg-server/makefile5
2 files changed, 6 insertions, 1 deletions
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