From d2d9977f1153b5222b34859a2cb22b957bfe3221 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 20 Nov 2009 13:01:45 +0000 Subject: Native glx is compiling and running now (although no acceleration is happening... to be investigated further) --- xorg-server/makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'xorg-server/makefile') 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 -- cgit v1.2.3