aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/makefile
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2009-11-20 13:01:45 +0000
committermarha <marha@users.sourceforge.net>2009-11-20 13:01:45 +0000
commitd2d9977f1153b5222b34859a2cb22b957bfe3221 (patch)
treea732c0c90bbd06bbf003e23a3ec08300e154a51d /xorg-server/makefile
parentda051c6af428703e746c6a1677e1dce032b86c41 (diff)
downloadvcxsrv-d2d9977f1153b5222b34859a2cb22b957bfe3221.tar.gz
vcxsrv-d2d9977f1153b5222b34859a2cb22b957bfe3221.tar.bz2
vcxsrv-d2d9977f1153b5222b34859a2cb22b957bfe3221.zip
Native glx is compiling and running now (although no acceleration is happening... to be investigated further)
Diffstat (limited to 'xorg-server/makefile')
-rw-r--r--xorg-server/makefile5
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/makefile b/xorg-server/makefile
index ce1f04c92..61f94c3a9 100644
--- a/xorg-server/makefile
+++ b/xorg-server/makefile
@@ -11,6 +11,7 @@ INCLUDELIBFILES = \
fb\$(OBJDIR)\libfb.lib \
glx\$(OBJDIR)\libglx.lib \
hw\xwin\$(OBJDIR)\libxwin.lib \
+ hw\xwin\glx\$(OBJDIR)\libwinglx.lib \
mi\$(OBJDIR)\libmi.lib \
miext\damage\$(OBJDIR)\libdamage.lib \
miext\shadow\$(OBJDIR)\libshadow.lib \
@@ -124,12 +125,12 @@ load_makefile xkbdata.src\makefile MAKESERVER=0 DEBUG=0
all: $(APP).exe xlaunch.exe xkbcomp.exe protocol.txt XKeysymDB XErrorDB \
..\libX11\nls\all fonts.src\all xkbdata.src\all plink.exe xclock.exe xcalc.exe \
- xwininfo.exe opengl32.dll swrast_dri.dll
+ xwininfo.exe mesaopengl32.dll swrast_dri.dll
swrast_dri.dll: ..\mesalib\lib\swrast_dri.dll
copy $< $@
-opengl32.dll: ..\mesalib\lib\opengl32.dll
+mesaopengl32.dll: ..\mesalib\lib\mesaopengl32.dll
copy $< $@
protocol.txt: dix\protocol.txt