r300g: align the height of NPOT textures to POT

[mesa.git] / src / gallium / winsys / g3dvl / nouveau / Makefile

diff --git a/src/gallium/winsys/g3dvl/nouveau/Makefile b/src/gallium/winsys/g3dvl/nouveau/Makefile
index 22d925b643669988d5ec4257a60e7910274f01cf..f07a7926d63cb131db28858240cdaa2147e2787c 100644 (file)
--- a/src/gallium/winsys/g3dvl/nouveau/Makefile
+++ b/src/gallium/winsys/g3dvl/nouveau/Makefile
@@ -11,6 +11,7 @@ CFLAGS                += -g -Wall -Werror=implicit-function-declaration -fPIC \
                   -I${GALLIUMDIR}/winsys/drm/nouveau                   \
                   -I${DRMDIR}/include                                  \
                   -I${DRMDIR}/include/drm                              \
+                  -I${DRMDIR}/include/nouveau                          \
                   -I${GALLIUMDIR}/drivers                              \
                   -I${GALLIUMDIR}/auxiliary                            \
                   -I${DRIDIR}/include
@@ -18,18 +19,12 @@ CFLAGS              += -g -Wall -Werror=implicit-function-declaration -fPIC \
 LDFLAGS                += -L${DRMDIR}/lib                              \
                   -L${DRIDIR}/lib                              \
                   -L${GALLIUMDIR}/winsys/drm/nouveau/common    \
-                  -L${GALLIUMDIR}/auxiliary/draw               \
-                  -L${GALLIUMDIR}/auxiliary/tgsi               \
-                  -L${GALLIUMDIR}/auxiliary/translate          \
-                  -L${GALLIUMDIR}/auxiliary/rtasm              \
-                  -L${GALLIUMDIR}/auxiliary/cso_cache          \
-                  -L${GALLIUMDIR}/drivers/nv10                 \
-                  -L${GALLIUMDIR}/drivers/nv20                 \
+                  -L${GALLIUMDIR}/auxiliary                    \
                   -L${GALLIUMDIR}/drivers/nv30                 \
                   -L${GALLIUMDIR}/drivers/nv40                 \
                   -L${GALLIUMDIR}/drivers/nv50
 
-LIBS           += -lnouveaudrm -ldriclient -ldrm -lnv10 -lnv20 -lnv30 -lnv40 -lnv50 -ldraw -ltgsi -ltranslate -lrtasm -lcso_cache -lm
+LIBS           += -lnouveaudrm -ldriclient -ldrm_nouveau -ldrm -lnv30 -lnv40 -lnv50 -lgallium -lm
 
 #############################################