diff options
| author | Christian König <[email protected]> | 2011-06-09 09:35:09 +0200 |
|---|---|---|
| committer | Christian König <[email protected]> | 2011-06-09 09:35:09 +0200 |
| commit | 003401f95c9b59471c22368b7da16fe7a951e490 (patch) | |
| tree | d21fa0197ff27b8a38bd8b1d795b74d816db8b26 /src/glx/apple/Makefile | |
| parent | 00b4e48560f4d576b7b1924257322f5167e58c8d (diff) | |
| parent | d302804debeed13ced27fce222110c629e55d6f9 (diff) | |
Merge remote-tracking branch 'origin/master' into pipe-video
Conflicts:
src/gallium/tests/unit/u_format_test.c
src/gallium/winsys/r600/drm/r600_hw_context.c
Diffstat (limited to 'src/glx/apple/Makefile')
| -rw-r--r-- | src/glx/apple/Makefile | 33 |
1 files changed, 14 insertions, 19 deletions
diff --git a/src/glx/apple/Makefile b/src/glx/apple/Makefile index fd47b3d39c2..c27f7d1e875 100644 --- a/src/glx/apple/Makefile +++ b/src/glx/apple/Makefile @@ -30,15 +30,14 @@ SOURCES = \ apple_glx_pixmap.c \ apple_glx_surface.c \ apple_visual.c \ - apple_xgl_api.c \ - apple_xgl_api_additional.c \ + apple_glapi.c \ apple_xgl_api_read.c \ apple_xgl_api_stereo.c \ apple_xgl_api_viewport.c \ appledri.c \ ../clientattrib.c \ ../compsize.c \ - ../glcontextmodes.c \ + ../glxconfig.c \ glx_empty.c \ glx_error.c \ ../glx_pbuffer.c \ @@ -49,22 +48,23 @@ SOURCES = \ ../glxextensions.c \ glxreply.c \ ../pixel.c \ - ../xfont.c + ../xfont.c \ + ../applegl_glx.c include $(TOP)/src/mesa/sources.mak -LDFLAGS += -lXplugin -framework ApplicationServices -framework CoreFoundation +# override GLAPI_LIB +GLAPI_LIB = $(TOP)/src/mapi/glapi/libglapi.a -MESA_GLAPI_ASM_SOURCES = $(addprefix $(TOP)/src/mesa/, $(GLAPI_ASM_SOURCES)) -MESA_GLAPI_SOURCES = $(addprefix $(TOP)/src/mesa/, $(GLAPI_SOURCES)) -MESA_GLAPI_OBJECTS = $(addprefix $(TOP)/src/mesa/, $(GLAPI_OBJECTS)) +LDFLAGS += -lXplugin -framework ApplicationServices -framework CoreFoundation -OBJECTS = $(SOURCES:.c=.o) # $(MESA_GLAPI_OBJECTS) +OBJECTS = $(SOURCES:.c=.o) INCLUDES = -I. -Iinclude -I..\ -I$(TOP)/include \ -I$(TOP)/include/GL/internal \ -I$(TOP)/src/mesa \ + -I$(TOP)/src/mesa/main \ -I$(TOP)/src/mapi \ -I$(TOP)/src/mapi/glapi \ $(LIBDRM_CFLAGS) \ @@ -73,13 +73,6 @@ INCLUDES = -I. -Iinclude -I..\ ##### RULES ##### -$(OBJECTS) : apple_xgl_api.h - -apple_xgl_api.c : apple_xgl_api.h - -apple_xgl_api.h : gen_api_header.tcl gen_api_library.tcl gen_code.tcl gen_defs.tcl gen_exports.tcl gen_funcs.tcl gen_types.tcl - $(TCLSH) gen_code.tcl - .c.o: $(CC) -c $(INCLUDES) $(CFLAGS) $(EXTRA_DEFINES) $< -o $@ @@ -91,11 +84,14 @@ apple_xgl_api.h : gen_api_header.tcl gen_api_library.tcl gen_code.tcl gen_def default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) # Make libGL -$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) Makefile +$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major 1 -minor 2 $(MKLIB_OPTIONS) \ -install $(TOP)/$(LIB_DIR) -id $(INSTALL_LIB_DIR)/lib$(GL_LIB).1.dylib \ - $(GL_LIB_DEPS) $(OBJECTS) + $(GL_LIB_DEPS) $(OBJECTS) $(GLAPI_LIB) + +$(GLAPI_LIB): + @$(MAKE) -C $(TOP)/src/mapi/glapi depend: $(SOURCES) $(MESA_GLAPI_SOURCES) $(MESA_GLAPI_ASM_SOURCES) Makefile rm -f depend @@ -120,7 +116,6 @@ install: install_libraries clean: -rm -f *.o *.a *~ -rm -f *.c~ *.h~ - -rm -f apple_xgl_api.h apple_xgl_api.c -rm -f *.dylib -rm -f include/GL/gl.h -rm -f $(TOP)/$(LIB_DIR)/$(GL_LIB_GLOB) |