head 1.2; access; symbols netbsd-7-2-RELEASE:1.1.1.3.2.1 netbsd-7-1-2-RELEASE:1.1.1.3.2.1 netbsd-7-1-1-RELEASE:1.1.1.3.2.1 netbsd-7-1:1.1.1.3.2.1.0.4 netbsd-7-1-RELEASE:1.1.1.3.2.1 netbsd-7-1-RC2:1.1.1.3.2.1 netbsd-7-1-RC1:1.1.1.3.2.1 netbsd-7-0-2-RELEASE:1.1.1.3.2.1 netbsd-7-0-1-RELEASE:1.1.1.3.2.1 netbsd-7-0:1.1.1.3.2.1.0.2 netbsd-7-0-RELEASE:1.1.1.3.2.1 netbsd-7-0-RC3:1.1.1.3.2.1 netbsd-7-0-RC2:1.1.1.3.2.1 netbsd-7-0-RC1:1.1.1.3.2.1 netbsd-6-0-6-RELEASE:1.1.1.2 netbsd-6-1-5-RELEASE:1.1.1.2 netbsd-7:1.1.1.3.0.2 netbsd-7-base:1.1.1.3 MesaLib-7-11-2:1.1.1.3 netbsd-6-1-4-RELEASE:1.1.1.2 netbsd-6-0-5-RELEASE:1.1.1.2 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.2 riastradh-drm2:1.1.1.2.0.8 riastradh-drm2-base:1.1.1.2 netbsd-6-1-3-RELEASE:1.1.1.2 netbsd-6-0-4-RELEASE:1.1.1.2 netbsd-6-1-2-RELEASE:1.1.1.2 netbsd-6-0-3-RELEASE:1.1.1.2 netbsd-6-1-1-RELEASE:1.1.1.2 netbsd-6-1:1.1.1.2.0.6 netbsd-6-0-2-RELEASE:1.1.1.2 netbsd-6-1-RELEASE:1.1.1.2 netbsd-6-1-RC4:1.1.1.2 netbsd-6-1-RC3:1.1.1.2 netbsd-6-1-RC2:1.1.1.2 netbsd-6-1-RC1:1.1.1.2 netbsd-6-0-1-RELEASE:1.1.1.2 netbsd-6-0:1.1.1.2.0.4 netbsd-6-0-RELEASE:1.1.1.2 netbsd-6-0-RC2:1.1.1.2 netbsd-6-0-RC1:1.1.1.2 netbsd-6:1.1.1.2.0.2 netbsd-6-base:1.1.1.2 MesaLib-7-8-2:1.1.1.2 MesaLib-7-7-1:1.1.1.1 xorg:1.1.1; locks; strict; comment @# @; 1.2 date 2014.12.18.06.11.36; author mrg; state dead; branches; next 1.1; commitid Ae59RsLlS9l0cu2y; 1.1 date 2010.05.23.21.22.33; author mrg; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2010.05.23.21.22.33; author mrg; state Exp; branches; next 1.1.1.2; 1.1.1.2 date 2010.07.19.05.31.48; author mrg; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2014.07.09.19.39.11; author riastradh; state Exp; branches 1.1.1.3.2.1; next ; commitid h96CLViPL8qdRJHx; 1.1.1.3.2.1 date 2015.01.06.09.26.24; author martin; state dead; branches; next ; commitid 2BxXkbQgg8gLEW4y; desc @@ 1.2 log @merge Mesa 10.3.5. @ text @TOP = ../../../.. include $(TOP)/configs/current LIBNAME = egldrm LIBRARY_INCLUDES = \ -I$(TOP)/src/gallium/include \ -I$(TOP)/src/gallium/auxiliary \ -I$(TOP)/src/mesa/drivers/dri/common \ -I$(TOP)/src/mesa \ -I$(TOP)/include \ -I$(TOP)/src/egl/main \ $(shell pkg-config --cflags-only-I libdrm) C_SOURCES = $(wildcard ./*.c) include ../../Makefile.template @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @initial import of MesaLib-7.7.1 @ text @@ 1.1.1.2 log @import Mesa 7.8.2, lib part. major changes since 7.7.1: - several new extensions for various drivers - many i965, i915 driver fixes - many glsl fixes @ text @d4 3 a6 2 common_INCLUDES = \ -I. \ d9 3 a12 11 -I$(TOP)/include common_SOURCES = $(wildcard common/*.c) common_OBJECTS = $(common_SOURCES:.c=.o) x11_INCLUDES = \ -I$(TOP)/src/gallium/drivers \ -I$(TOP)/src/glx \ -I$(TOP)/src/mesa \ $(X11_CFLAGS) \ a14 45 x11_SOURCES = $(wildcard x11/*.c) \ $(TOP)/src/glx/dri2.c x11_OBJECTS = $(x11_SOURCES:.c=.o) kms_INCLUDES = $(shell pkg-config --cflags-only-I libdrm) kms_SOURCES = $(wildcard kms/*.c) kms_OBJECTS = $(kms_SOURCES:.c=.o) ALL_INCLUDES = $(common_INCLUDES) $(x11_INCLUDES) $(kms_INCLUDES) ALL_SOURCES = $(common_SOURCES) $(x11_SOURCES) $(kms_SOURCES) ALL_OBJECTS = $(common_OBJECTS) $(x11_OBJECTS) $(kms_OBJECTS) ##### TARGETS ##### EGL_DISPLAYS_MODS = $(foreach dpy, $(EGL_DISPLAYS), libegl$(dpy).a) default: depend $(EGL_DISPLAYS_MODS) libeglx11.a: $(x11_OBJECTS) $(common_OBJECTS) Makefile $(MKLIB) -o eglx11 -static $(x11_OBJECTS) $(common_OBJECTS) libeglkms.a: $(kms_OBJECTS) $(common_OBJECTS) Makefile $(MKLIB) -o eglkms -static $(kms_OBJECTS) $(common_OBJECTS) depend: rm -f depend touch depend $(MKDEP) $(MKDEP_OPTIONS) $(ALL_INCLUDES) $(ALL_SOURCES) 2> /dev/null clean: rm -f $(ALL_OBJECTS) rm -f $(EGL_DISPLAYS_MODS) rm -f depend depend.bak # Dummy target install: @@echo -n "" ##### RULES ##### $(common_OBJECTS): %.o: %.c $(CC) -c $(common_INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@@ d16 1 a16 2 $(x11_OBJECTS): %.o: %.c $(CC) -c $(common_INCLUDES) $(x11_INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@@ a17 2 $(kms_OBJECTS): %.o: %.c $(CC) -c $(common_INCLUDES) $(kms_INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@@ d19 1 a19 1 sinclude depend @ 1.1.1.3 log @import MesaLib 7.11.2 Brings in support for Intel Sandy Bridge and Ivy Bridge hardware, a new shader language compiler, and various other improvements too numerous to list here; see for details. @ text @a8 1 -I$(TOP)/src/egl/wayland/wayland-drm/ \ d14 1 a17 1 -I$(TOP)/src/mapi \ d20 1 a20 1 $(shell pkg-config --cflags-only-I libdrm dri2proto) d26 9 a34 44 wayland_INCLUDES = \ -I$(TOP)/src/gallium/winsys \ -I$(TOP)/src/egl/wayland/wayland-egl \ -I$(TOP)/src/egl/wayland/wayland-drm \ $(shell pkg-config --cflags-only-I libdrm wayland-client) wayland_SOURCES = $(wildcard wayland/*.c) wayland_OBJECTS = $(wayland_SOURCES:.c=.o) drm_INCLUDES = -I$(TOP)/src/gallium/winsys $(shell pkg-config --cflags-only-I libdrm) \ -I$(TOP)/src/gbm/main -I$(TOP)/src/gallium/state_trackers/gbm drm_SOURCES = $(wildcard drm/*.c) drm_OBJECTS = $(drm_SOURCES:.c=.o) fbdev_INCLUDES = -I$(TOP)/src/gallium/winsys/sw fbdev_SOURCES = $(wildcard fbdev/*.c) fbdev_OBJECTS = $(fbdev_SOURCES:.c=.o) ALL_INCLUDES = $(common_INCLUDES) $(x11_INCLUDES) $(drm_INCLUDES) $(fbdev_INCLUDES) ALL_SOURCES = $(common_SOURCES) $(x11_SOURCES) $(drm_SOURCES) $(fbdev_SOURCES) EGL_OBJECTS = $(common_OBJECTS) EGL_CPPFLAGS = $(common_INCLUDES) # add backends ifneq ($(findstring x11, $(EGL_PLATFORMS)),) EGL_OBJECTS += $(x11_OBJECTS) EGL_CPPFLAGS += -DHAVE_X11_BACKEND endif ifneq ($(findstring wayland, $(EGL_PLATFORMS)),) EGL_OBJECTS += $(wayland_OBJECTS) EGL_CPPFLAGS += -DHAVE_WAYLAND_BACKEND DEFINES += -DHAVE_WAYLAND_BACKEND endif ifneq ($(findstring drm, $(EGL_PLATFORMS)),) EGL_OBJECTS += $(drm_OBJECTS) EGL_CPPFLAGS += -DHAVE_DRM_BACKEND endif ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),) EGL_OBJECTS += $(fbdev_OBJECTS) EGL_CPPFLAGS += -DHAVE_FBDEV_BACKEND endif d38 3 a40 1 default: depend libegl.a d42 6 a47 2 libegl.a: $(EGL_OBJECTS) Makefile $(MKLIB) -o egl -static $(EGL_OBJECTS) d55 2 a56 2 rm -f libegl.a rm -f $(EGL_OBJECTS) a64 4 define egl-cc $(CC) -c $(common_INCLUDES) $($(1)_INCLUDES) $(DEFINES) $(CFLAGS) $< -o $@@ endef d66 1 a66 1 $(CC) -c $(EGL_CPPFLAGS) $(DEFINES) $(CFLAGS) $< -o $@@ d69 1 a69 7 $(call egl-cc,x11) $(wayland_OBJECTS): %.o: %.c $(call egl-cc,wayland) $(drm_OBJECTS): %.o: %.c $(call egl-cc,drm) d71 2 a72 2 $(fbdev_OBJECTS): %.o: %.c $(call egl-cc,fbdev) @ 1.1.1.3.2.1 log @File removals that accidently did not happen during pullup of the new MesaLib for ticket #381 @ text @@