diff options
| author | marha <marha@users.sourceforge.net> | 2010-08-05 20:27:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-08-05 20:27:04 +0000 |
| commit | c29011f2831315d3da9c4727c1e626d80520b97a (patch) | |
| tree | ffa2ed8b1d69d46026787426c736ad865c50a8e0 /xorg-server/makefile | |
| parent | 9b26d3820455811cc00693a220b4d3a69356a8c7 (diff) | |
| parent | c115795736eb99a8f2288a06c231b9386f4d011f (diff) | |
| download | vcxsrv-c29011f2831315d3da9c4727c1e626d80520b97a.tar.gz vcxsrv-c29011f2831315d3da9c4727c1e626d80520b97a.tar.bz2 vcxsrv-c29011f2831315d3da9c4727c1e626d80520b97a.zip | |
svn merge ^/branches/released .
Added xkeysymdb now here since it was removed from libx11. If it is removed the keyboard does not work well
Diffstat (limited to 'xorg-server/makefile')
| -rw-r--r-- | xorg-server/makefile | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile index b14e04a82..3c9f767d1 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -83,9 +83,6 @@ RESOURCES = XWin.rc $(OBJDIR)\$(APP).exe: $(LINKLIBS) -XKeysymDB: ..\libX11\src\XKeysymDB - copy $< $@ - XErrorDB: ..\libX11\src\XErrorDB copy $< $@ @@ -123,7 +120,7 @@ load_makefile ..\libX11\nls\makefile MAKESERVER=0 DEBUG=0 load_makefile fonts.src\makefile MAKESERVER=0 DEBUG=0 load_makefile xkeyboard-config\makefile MAKESERVER=0 DEBUG=0 -all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB XErrorDB \ +all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XErrorDB \ ..\libX11\nls\all fonts.src\all xkeyboard-config\all plink.exe xclock.exe xcalc.exe \ xwininfo.exe swrast_dri.dll swrast_dri_dbg.dll |