From 1f158df2811fe952d91baf79877d7f4ca73430e3 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 16 Dec 2011 08:55:52 +0100 Subject: Solved compilation error --- xorg-server/hw/xwin/swrastwgl_dri/makefile | 36 +++++++++++++++--------------- 1 file changed, 18 insertions(+), 18 deletions(-) (limited to 'xorg-server/hw/xwin/swrastwgl_dri') diff --git a/xorg-server/hw/xwin/swrastwgl_dri/makefile b/xorg-server/hw/xwin/swrastwgl_dri/makefile index c72b54260..ebdda1cd5 100644 --- a/xorg-server/hw/xwin/swrastwgl_dri/makefile +++ b/xorg-server/hw/xwin/swrastwgl_dri/makefile @@ -1,18 +1,18 @@ -SHAREDLIB = swrastwgl_dri - -INCLUDES += $(OBJDIR) ..\..\.. .. -DEFINES += INSERVER - -ifeq ($(DEBUG),1) -LINKLIBS += ..\..\..\obj\servdebug\vcxsrv_dbg.lib -else -LINKLIBS += ..\..\..\obj\servrelease\vcxsrv.lib -endif - -CSRCS = swrastwgl_dri.c glwrap.c wgl_ext_api.c - -$(OBJDIR)\generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm - gen_gl_wrappers --spec=gl.spec --typemap=gl.tm --dispatch-header=../../../glx/dispatch.h --staticwrappers > $@ - -$(OBJDIR)\generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm - gen_gl_wrappers --spec=wglext.spec --typemap=wgl.tm --prefix=wgl --preresolve > $@ +SHAREDLIB = swrastwgl_dri + +INCLUDES += $(OBJDIR) ..\..\.. .. +DEFINES += INSERVER HAVE_XWIN_CONFIG_H PTW32_STATIC_LIB + +ifeq ($(DEBUG),1) +LINKLIBS += ..\..\..\obj\servdebug\vcxsrv_dbg.lib +else +LINKLIBS += ..\..\..\obj\servrelease\vcxsrv.lib +endif + +CSRCS = swrastwgl_dri.c glwrap.c wgl_ext_api.c + +$(OBJDIR)\generated_gl_wrappers.c: gen_gl_wrappers.py gl.spec gl.tm + gen_gl_wrappers --spec=gl.spec --typemap=gl.tm --dispatch-header=../../../glx/dispatch.h --staticwrappers > $@ + +$(OBJDIR)\generated_wgl_wrappers.c: gen_gl_wrappers.py wglext.spec wgl.tm + gen_gl_wrappers --spec=wglext.spec --typemap=wgl.tm --prefix=wgl --preresolve > $@ -- cgit v1.2.3