From e50b38aebb733934db7ef3ec13c330407afd9ada Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 15 Apr 2013 09:50:01 +0200 Subject: xrdb now compiles and links --- xorg-server/installer/vcxsrv-debug.nsi | 1 + xorg-server/installer/vcxsrv.nsi | 1 + xorg-server/makefile | 1 + 3 files changed, 3 insertions(+) (limited to 'xorg-server') diff --git a/xorg-server/installer/vcxsrv-debug.nsi b/xorg-server/installer/vcxsrv-debug.nsi index fb9f5539d..10adb6888 100644 --- a/xorg-server/installer/vcxsrv-debug.nsi +++ b/xorg-server/installer/vcxsrv-debug.nsi @@ -65,6 +65,7 @@ Section "VcXsrv debug exe and dlls" File "..\obj\servdebug\vcxsrv.exe" File "..\..\xkbcomp\obj\debug\xkbcomp.exe" File "..\..\apps\xhost\obj\debug\xhost.exe" + File "..\..\apps\xrdb\obj\debug\xrdb.exe" File "..\..\apps\xauth\obj\debug\xauth.exe" File "..\..\apps\xcalc\obj\debug\xcalc.exe" File "..\..\apps\xclock\obj\debug\xclock.exe" diff --git a/xorg-server/installer/vcxsrv.nsi b/xorg-server/installer/vcxsrv.nsi index a6e492eae..103b13cd5 100644 --- a/xorg-server/installer/vcxsrv.nsi +++ b/xorg-server/installer/vcxsrv.nsi @@ -72,6 +72,7 @@ Section "VcXsrv (required)" File "..\system.XWinrc" File "..\..\xkbcomp\obj\release\xkbcomp.exe" File "..\..\apps\xhost\obj\release\xhost.exe" + File "..\..\apps\xrdb\obj\release\xrdb.exe" File "..\..\apps\xauth\obj\release\xauth.exe" File "..\..\apps\xcalc\obj\release\xcalc.exe" File "..\..\apps\xcalc\app-defaults\xcalc" diff --git a/xorg-server/makefile b/xorg-server/makefile index caaa12029..5e31c21d3 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -88,6 +88,7 @@ EXTRASTOBUILD = \ ..\apps\xclock\$(NOSERVOBJDIR)\xclock.exe \ ..\apps\xwininfo\$(NOSERVOBJDIR)\xwininfo.exe \ ..\apps\xhost\$(NOSERVOBJDIR)\xhost.exe \ + ..\apps\xrdb\$(NOSERVOBJDIR)\xrdb.exe \ ..\apps\xauth\$(NOSERVOBJDIR)\xauth.exe \ ..\tools\plink\$(NOSERVOBJDIR)\plink.exe \ hw\xwin\swrastwgl_dri\$(NOSERVOBJDIR)\swrastwgl_dri.dll \ -- cgit v1.2.3