Use SecondaryColorPtr, not ColorPtr[1] (the latter is NULL).

[mesa.git] / src / mesa / drivers / dri / x11 / Makefile

diff --git a/src/mesa/drivers/dri/x11/Makefile b/src/mesa/drivers/dri/x11/Makefile
index b98441a299ab54b60a1c1cf79315660b75581396..76c157b0958e3922be19ec6bbe96b55cb6a34c84 100644 (file)
--- a/src/mesa/drivers/dri/x11/Makefile
+++ b/src/mesa/drivers/dri/x11/Makefile
@@ -7,7 +7,7 @@ LIBNAME = x11_dri.so
 
 DRIVER_SOURCES = x11_dri.c \
                 $(TOP)/src/mesa/drivers/common/driverfuncs.c \
-                ../dri_client/dri_util.c \
+                ../common/dri_util.c \
                 ../../x11/xm_api.c \
                 ../../x11/xm_dd.c \
                 ../../x11/xm_line.c \
@@ -67,14 +67,14 @@ default: depend $(LIB_DIR)/$(LIBNAME)
 
 
 $(LIB_DIR)/$(LIBNAME): $(OBJECTS) $(MESA_MODULES) $(WINOBJ) Makefile
-       $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
+       CC="$(CC)" CXX="$(CXX)" $(TOP)/bin/mklib -o $(LIBNAME) -noprefix -install $(LIB_DIR) \
                $(OBJECTS) $(WINLIB) $(LIB_DEPS) $(WINOBJ) $(MESA_MODULES)
 
 
 depend: $(C_SOURCES) $(ASM_SOURCES)
        touch depend
        $(MKDEP) $(MKDEP_OPTIONS) $(INCLUDE_DIRS) $(C_SOURCES) $(ASM_SOURCES) \
-               >& /dev/null
+               > /dev/null 
 
 
 # Emacs tags