Fix Windows build problems.

[mesa.git] / src / glx / x11 / Makefile

diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 8982f01a15521db8a2a64d2a8a611dc232ad5b5d..415ec02dd6b7d23e8659f599c96b595808afdbbd 100644 (file)
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -1,28 +1,15 @@
 TOP = ../../..
 include $(TOP)/configs/current
 
-# This is a bit messy.  We want this libGL to be capable of loading old
-# interface drivers, so we have to turn off DRI_NEW_INTERFACE_ONLY.  However,
-# glcontextmodes.c is built elsewhere with DNIO on, so we symlink it across.
-# 
-# Furthermore, context creation has evolved over the years, such that this
-# code will not build with DNIO defined.  When we finally drop old interface
-# support in libGL, we need to clean up both glxcmds.c and dri_interface.h.
-
-DEFINES += -DGLX_DIRECT_RENDERING -DGLXEXT -DXF86DRI -DGLX_USE_DLOPEN \
-       -DGLX_USE_MESA -DXF86VIDMODE -D_REENTRANT -UDRI_NEW_INTERFACE_ONLY
+DEFINES += -DXF86VIDMODE -D_REENTRANT -UIN_DRI_DRIVER
 
 C_SOURCES = \
          $(TOP)/src/mesa/glapi/glapi.c \
          $(TOP)/src/mesa/glapi/glthread.c \
+         $(TOP)/src/mesa/main/dispatch.c \
          glcontextmodes.c \
-         $(DRM_SOURCE_PATH)/libdrm/xf86drm.c \
-         $(DRM_SOURCE_PATH)/libdrm/xf86drmHash.c \
-         $(DRM_SOURCE_PATH)/libdrm/xf86drmRandom.c \
-         $(DRM_SOURCE_PATH)/libdrm/xf86drmSL.c \
          clientattrib.c \
          compsize.c \
-         dispatch.c \
          eval.c \
          glxcmds.c \
          glxext.c \
@@ -59,16 +46,10 @@ OBJECTS = $(C_SOURCES:.c=.o) \
 INCLUDES = -I. \
        -I$(TOP)/include \
        -I$(TOP)/include/GL/internal \
-       -I$(TOP)/src/mesa \
        -I$(TOP)/src/mesa/main \
        -I$(TOP)/src/mesa/glapi \
-       -I$(TOP)/src/mesa/math \
-       -I$(TOP)/src/mesa/transform \
-       -I$(TOP)/src/mesa/swrast \
-       -I$(TOP)/src/mesa/swrast_setup \
        -I$(TOP)/src/mesa/drivers/dri/common \
-       -I$(DRM_SOURCE_PATH)/libdrm \
-       -I$(DRM_SOURCE_PATH)/shared-core \
+        `pkg-config --cflags libdrm` \
        $(X11_INCLUDES)
 
 
@@ -87,19 +68,13 @@ default: depend $(LIB_DIR)/$(GL_LIB_NAME)
 glcontextmodes.c:
        ln -s $(TOP)/src/mesa/drivers/dri/common/glcontextmodes.c .
 
-dispatch.c:
-       ln -s $(TOP)/src/mesa/main/dispatch.c .
-
 # Make libGL
 $(LIB_DIR)/$(GL_LIB_NAME):  $(OBJECTS) Makefile
-       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(GL_LIB) -major 1 -minor 2 $(MKLIB_OPTIONS) \
+       $(TOP)/bin/mklib -o $(GL_LIB) -linker '$(CC)' \
+               -major 1 -minor 2 $(MKLIB_OPTIONS) \
                -install $(LIB_DIR) $(GL_LIB_DEPS) $(OBJECTS)
 
 
-drmtest: xf86drm.o drmtest.o
-       rm -f drmtest && $(CC) -o drmtest xf86drm.o drmtest.o
-
-
 depend: $(C_SOURCES) $(ASM_SOURCES) Makefile
        touch depend
        $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDES) $(C_SOURCES) $(ASM_SOURCES)