projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mesa: consolidate general ubyte texstore code
[mesa.git]
/
src
/
glx
/
Makefile
diff --git
a/src/glx/Makefile
b/src/glx/Makefile
index 6711fdc61bb3753739a1361476c181b766d8327f..f702f952ce7561dc6ee6f0e5dabbad37177f7f83 100644
(file)
--- a/
src/glx/Makefile
+++ b/
src/glx/Makefile
@@
-1,18
+1,26
@@
TOP = ../..
include $(TOP)/configs/current
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 = \
-DDEFAULT_DRIVER_DIR=\"$(DRI_DRIVER_SEARCH_DIR)\"
SOURCES = \
- glcontextmodes.c \
clientattrib.c \
clientattrib.c \
+ clientinfo.c \
compsize.c \
compsize.c \
+ create_context.c \
eval.c \
eval.c \
+ glxconfig.c \
glxcmds.c \
glxcurrent.c \
glxcmds.c \
glxcurrent.c \
+ glx_error.c \
glxext.c \
glxextensions.c \
glxext.c \
glxextensions.c \
+ indirect_glx.c \
indirect.c \
indirect_init.c \
indirect_size.c \
indirect.c \
indirect_init.c \
indirect_size.c \
@@
-37,9
+45,17
@@
SOURCES = \
XF86dri.c \
glxhash.c \
dri2_glx.c \
XF86dri.c \
glxhash.c \
dri2_glx.c \
- dri2.c
+ dri2.c \
+ applegl_glx.c
+
-GLAPI_LIB = $(TOP)/src/mesa/libglapi.a
+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)
OBJECTS = $(SOURCES:.c=.o)
@@
-47,9
+63,11
@@
INCLUDES = -I. \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
-I$(TOP)/src/mesa \
- -I$(TOP)/src/mesa/glapi \
+ -I$(TOP)/src/mapi \
+ -I$(TOP)/src/mapi/glapi \
$(LIBDRM_CFLAGS) \
$(DRI2PROTO_CFLAGS) \
$(LIBDRM_CFLAGS) \
$(DRI2PROTO_CFLAGS) \
+ $(GLPROTO_CFLAGS) \
$(X11_INCLUDES)
$(X11_INCLUDES)
@@
-65,15
+83,19
@@
INCLUDES = -I. \
default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
+libglx.a: $(OBJECTS)
+ $(MKLIB) -cplusplus -o glx -static $(OBJECTS)
+
# Make libGL
# 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)
$(GLAPI_LIB):
-install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).1.dylib \
$(GL_LIB_DEPS) $(OBJECTS) $(GLAPI_LIB)
$(GLAPI_LIB):
- @$(MAKE) -C $(TOP)/src/m
esa libglapi.a
+ @$(MAKE) -C $(TOP)/src/m
api/glapi
depend: $(SOURCES) Makefile
rm -f depend
depend: $(SOURCES) Makefile
rm -f depend
@@
-90,7
+112,7
@@
install: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
# Remove .o and backup files
clean:
# Remove .o and backup files
clean:
- -rm -f $(TOP)/$(LIB_DIR)/
libGL.so*
+ -rm -f $(TOP)/$(LIB_DIR)/
$(GL_LIB_GLOB)
-rm -f *.o *~
-rm -f depend depend.bak
-rm -f *.o *~
-rm -f depend depend.bak