mesa: consolidate general ubyte texstore code

[mesa.git] / src / glx / Makefile

diff --git a/src/glx/Makefile b/src/glx/Makefile
index 48d901fb894f0f6244c257001726b1e78095411d..f702f952ce7561dc6ee6f0e5dabbad37177f7f83 100644 (file)
--- a/src/glx/Makefile
+++ b/src/glx/Makefile
@@ -1,18 +1,26 @@
 TOP = ../..
 include $(TOP)/configs/current
 
-EXTRA_DEFINES = -DXF86VIDMODE -D_REENTRANT \
+ifeq ($(HAVE_XF86VIDMODE),yes)
+EXTRA_DEFINES_XF86VIDMODE = -DXF86VIDMODE
+endif
+
+EXTRA_DEFINES = $(EXTRA_DEFINES_XF86VIDMODE) -D_REENTRANT \
                 -DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\"
 
 SOURCES = \
-         glcontextmodes.c \
          clientattrib.c \
+         clientinfo.c \
          compsize.c \
+         create_context.c \
          eval.c \
+         glxconfig.c \
          glxcmds.c \
          glxcurrent.c \
+         glx_error.c \
          glxext.c \
          glxextensions.c \
+         indirect_glx.c \
          indirect.c \
          indirect_init.c \
          indirect_size.c \
@@ -37,8 +45,16 @@ SOURCES = \
          XF86dri.c \
          glxhash.c \
          dri2_glx.c \
-         dri2.c
+         dri2.c \
+         applegl_glx.c
+
 
+ifeq ($(SHARED_GLAPI),1)
+GL_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(GL_LIB_DEPS)
+EXTRA_DEFINES += -DGLX_SHARED_GLAPI
+endif
+
+# override GLAPI_LIB
 GLAPI_LIB = $(TOP)/src/mapi/glapi/libglapi.a
 
 OBJECTS = $(SOURCES:.c=.o)
@@ -51,6 +67,7 @@ INCLUDES = -I. \
        -I$(TOP)/src/mapi/glapi \
        $(LIBDRM_CFLAGS) \
        $(DRI2PROTO_CFLAGS) \
+       $(GLPROTO_CFLAGS) \
        $(X11_INCLUDES)
 
 
@@ -66,10 +83,14 @@ INCLUDES = -I. \
 
 default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
 
+libglx.a: $(OBJECTS)
+       $(MKLIB) -cplusplus -o glx -static $(OBJECTS)
+
 # Make libGL
-$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
-       $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
-               -major 1 -minor 2 $(MKLIB_OPTIONS) \
+$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): libglx.a $(OBJECTS) $(GLAPI_LIB) Makefile
+       $(MKLIB) -o $(GL_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \
+               -major 1 -minor 2 \
+               -cplusplus $(MKLIB_OPTIONS) \
                -install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).1.dylib \
                $(GL_LIB_DEPS) $(OBJECTS) $(GLAPI_LIB)