diff options
| author | marha <marha@users.sourceforge.net> | 2015-02-24 07:44:41 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2015-02-24 07:44:41 +0100 |
| commit | f64e43decd0fdac938feddeedee255dc4508aaa5 (patch) | |
| tree | 34e1cfaaea9ad73d9335197ee79b4f99affe4ea9 /xorg-server/makefile | |
| parent | 462f18c7b25fe3e467f837647d07ab0a78aa8d2b (diff) | |
| parent | ac2c8a704aac7569f4ae85b890a546644bd86c60 (diff) | |
| download | vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.tar.gz vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.tar.bz2 vcxsrv-f64e43decd0fdac938feddeedee255dc4508aaa5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xcalc/math.c
freetype/src/base/ftbdf.c
freetype/src/base/fttype1.c
freetype/src/pfr/pfrobjs.c
mesalib/src/mesa/main/.gitignore
openssl/Configure
openssl/Makefile
openssl/crypto/cryptlib.c
openssl/crypto/opensslconf.h
openssl/test/v3nametest.c
openssl/util/mk1mf.pl
openssl/util/pl/VC-32.pl
xorg-server/Xi/xipassivegrab.c
xorg-server/dix/dispatch.c
xorg-server/dix/getevents.c
xorg-server/glx/glxcmds.c
xorg-server/glx/indirect_reqsize.c
xorg-server/glx/indirect_reqsize.h
xorg-server/hw/xwin/winclipboard/internal.h
xorg-server/hw/xwin/winclipboard/thread.c
xorg-server/hw/xwin/winclipboard/wndproc.c
xorg-server/hw/xwin/winclipboard/xevents.c
xorg-server/hw/xwin/winclipboardwrappers.c
xorg-server/hw/xwin/winprocarg.c
xorg-server/render/render.c
Diffstat (limited to 'xorg-server/makefile')
| -rw-r--r-- | xorg-server/makefile | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile index 789b73114..f721a6c1e 100644 --- a/xorg-server/makefile +++ b/xorg-server/makefile @@ -34,6 +34,7 @@ INCLUDENOSERVLIBFILES = \ $(MHMAKECONF)\pixman\pixman\$(NOSERVOBJDIR)\libpixman-1.lib \ $(MHMAKECONF)\libXdmcp\$(NOSERVOBJDIR)\libXdmcp.lib \ $(MHMAKECONF)\libXau\$(NOSERVOBJDIR)\libXau.lib \ + $(MHMAKECONF)\libXfixes\src\$(NOSERVOBJDIR)\libXfixes.lib \ $(MHMAKECONF)\libXfont\src\util\$(NOSERVOBJDIR)\libutil.lib \ $(MHMAKECONF)\libXfont\src\fc\$(NOSERVOBJDIR)\libfc.lib \ $(MHMAKECONF)\libXfont\src\fontfile\$(NOSERVOBJDIR)\libfontfile.lib \ |