Merge branch 'gallium-polygon-stipple'

[mesa.git] / src / gallium / targets / libgl-xlib / Makefile

diff --git a/src/gallium/targets/libgl-xlib/Makefile b/src/gallium/targets/libgl-xlib/Makefile
index 6cd00cad45896a5d69100dc3a880d39a1610124b..f8f6c81b3f2fce86389ac6ee38a82f97a0cec065 100644 (file)
--- a/src/gallium/targets/libgl-xlib/Makefile
+++ b/src/gallium/targets/libgl-xlib/Makefile
@@ -10,20 +10,25 @@ include $(TOP)/configs/current
 
 GL_MAJOR = 1
 GL_MINOR = 5
-GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
+GL_TINY = 0$(MESA_MAJOR)$(MESA_MINOR)0$(MESA_TINY)
 
 
 INCLUDE_DIRS = \
        -I$(TOP)/include \
+       -I$(TOP)/src/mapi \
        -I$(TOP)/src/mesa \
        -I$(TOP)/src/mesa/main \
        -I$(TOP)/src/gallium/include \
        -I$(TOP)/src/gallium/drivers \
        -I$(TOP)/src/gallium/state_trackers/glx/xlib \
-       -I$(TOP)/src/gallium/auxiliary
+       -I$(TOP)/src/gallium/auxiliary \
+       $(X11_CFLAGS)
 
 DEFINES += \
-       -DGALLIUM_SOFTPIPE
+       -DGALLIUM_SOFTPIPE \
+       -DGALLIUM_RBUG \
+       -DGALLIUM_TRACE \
+       -DGALLIUM_GALAHAD
 #-DGALLIUM_CELL will be defined by the config */
 
 XLIB_TARGET_SOURCES = \
@@ -40,13 +45,27 @@ LIBS = \
        $(TOP)/src/gallium/state_trackers/glx/xlib/libxlib.a \
        $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a \
        $(TOP)/src/gallium/drivers/trace/libtrace.a \
-       $(TOP)/src/gallium/drivers/identity/libidentity.a \
-       $(TOP)/src/mesa/libglapi.a \
+       $(TOP)/src/gallium/drivers/rbug/librbug.a \
+       $(TOP)/src/gallium/drivers/galahad/libgalahad.a \
+       $(TOP)/src/mapi/glapi/libglapi.a \
        $(TOP)/src/mesa/libmesagallium.a \
        $(GALLIUM_AUXILIARIES) \
        $(CELL_SPU_LIB) \
 
 
+# LLVM
+ifeq ($(MESA_LLVM),1)
+PIPE_DRIVERS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a
+DEFINES += -DGALLIUM_LLVMPIPE
+GL_LIB_DEPS += $(LLVM_LIBS) 
+LDFLAGS += $(LLVM_LDFLAGS)
+endif
+
+ifeq ($(SHARED_GLAPI),1)
+GL_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(GL_LIB_DEPS)
+endif
+
+
 .SUFFIXES : .cpp
 
 .c.o:
@@ -65,8 +84,9 @@ $(TOP)/$(LIB_DIR)/gallium:
 # Make the libGL.so library
 $(TOP)/$(LIB_DIR)/gallium/$(GL_LIB_NAME): $(XLIB_TARGET_OBJECTS) $(LIBS) Makefile
        $(TOP)/bin/mklib -o $(GL_LIB) \
-               -linker "$(CC)" \
+               -linker "$(CXX)" -ldflags '$(LDFLAGS)' \
                -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \
+               -cplusplus \
                -install $(TOP)/$(LIB_DIR)/gallium \
                $(MKLIB_OPTIONS) $(XLIB_TARGET_OBJECTS) \
                -Wl,--start-group $(LIBS) -Wl,--end-group $(GL_LIB_DEPS)
@@ -94,7 +114,7 @@ tags:
        etags `find . -name \*.[ch]` $(TOP)/include/GL/*.h
 
 clean:
-       -rm -f *.o
+       -rm -f *.o depend
 
 
 include depend