Merge branch 'llvm-cliptest-viewport'

[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 e745023ba598ce439066e41e4e4b01b7463c02bf..076a040a5abe6a9e56b4fa46a877b106cc9edae9 100644 (file)
--- a/src/gallium/targets/libgl-xlib/Makefile
+++ b/src/gallium/targets/libgl-xlib/Makefile
@@ -10,7 +10,7 @@ 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 = \
@@ -25,7 +25,8 @@ INCLUDE_DIRS = \
        $(X11_CFLAGS)
 
 DEFINES += \
-       -DGALLIUM_SOFTPIPE
+       -DGALLIUM_SOFTPIPE \
+       -DGALLIUM_GALAHAD
 #-DGALLIUM_CELL will be defined by the config */
 
 XLIB_TARGET_SOURCES = \
@@ -50,6 +51,14 @@ LIBS = \
        $(CELL_SPU_LIB) \
 
 
+# LLVM
+ifeq ($(MESA_LLVM),1)
+DEFINES += -DGALLIUM_LLVMPIPE
+GL_LIB_DEPS += $(LLVM_LIBS) 
+LDFLAGS += $(LLVM_LDFLAGS)
+endif
+
+
 .SUFFIXES : .cpp
 
 .c.o:
@@ -68,8 +77,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)