head 1.2; access; symbols netbsd-7-2-RELEASE:1.1.1.4.2.1 netbsd-7-1-2-RELEASE:1.1.1.4.2.1 netbsd-7-1-1-RELEASE:1.1.1.4.2.1 netbsd-7-1:1.1.1.4.2.1.0.4 netbsd-7-1-RELEASE:1.1.1.4.2.1 netbsd-7-1-RC2:1.1.1.4.2.1 netbsd-7-1-RC1:1.1.1.4.2.1 netbsd-7-0-2-RELEASE:1.1.1.4.2.1 netbsd-7-0-1-RELEASE:1.1.1.4.2.1 netbsd-7-0:1.1.1.4.2.1.0.2 netbsd-7-0-RELEASE:1.1.1.4.2.1 netbsd-7-0-RC3:1.1.1.4.2.1 netbsd-7-0-RC2:1.1.1.4.2.1 netbsd-7-0-RC1:1.1.1.4.2.1 netbsd-5-2-3-RELEASE:1.1.1.1.2.2 netbsd-5-1-5-RELEASE:1.1.1.1.2.2 netbsd-6-0-6-RELEASE:1.1.1.3 netbsd-6-1-5-RELEASE:1.1.1.3 netbsd-7:1.1.1.4.0.2 netbsd-7-base:1.1.1.4 MesaLib-7-11-2:1.1.1.4 netbsd-6-1-4-RELEASE:1.1.1.3 netbsd-6-0-5-RELEASE:1.1.1.3 riastradh-xf86-video-intel-2-7-1-pre-2-21-15:1.1.1.3 riastradh-drm2:1.1.1.3.0.8 riastradh-drm2-base:1.1.1.3 netbsd-6-1-3-RELEASE:1.1.1.3 netbsd-6-0-4-RELEASE:1.1.1.3 netbsd-5-2-2-RELEASE:1.1.1.1.2.2 netbsd-5-1-4-RELEASE:1.1.1.1.2.2 netbsd-6-1-2-RELEASE:1.1.1.3 netbsd-6-0-3-RELEASE:1.1.1.3 netbsd-5-2-1-RELEASE:1.1.1.1.2.2 netbsd-5-1-3-RELEASE:1.1.1.1.2.2 netbsd-6-1-1-RELEASE:1.1.1.3 netbsd-6-1:1.1.1.3.0.6 netbsd-6-0-2-RELEASE:1.1.1.3 netbsd-6-1-RELEASE:1.1.1.3 netbsd-6-1-RC4:1.1.1.3 netbsd-6-1-RC3:1.1.1.3 netbsd-6-1-RC2:1.1.1.3 netbsd-6-1-RC1:1.1.1.3 netbsd-5-2:1.1.1.1.2.2.0.4 netbsd-6-0-1-RELEASE:1.1.1.3 netbsd-5-2-RELEASE:1.1.1.1.2.2 netbsd-5-2-RC1:1.1.1.1.2.2 netbsd-6-0:1.1.1.3.0.4 netbsd-6-0-RELEASE:1.1.1.3 netbsd-6-0-RC2:1.1.1.3 netbsd-6-0-RC1:1.1.1.3 netbsd-6:1.1.1.3.0.2 netbsd-6-base:1.1.1.3 netbsd-5-1-2-RELEASE:1.1.1.1.2.2 netbsd-5-1-1-RELEASE:1.1.1.1.2.2 netbsd-5-1:1.1.1.1.2.2.0.2 netbsd-5-1-RELEASE:1.1.1.1.2.2 netbsd-5-1-RC4:1.1.1.1.2.2 MesaLib-7-8-2:1.1.1.3 netbsd-5-1-RC3:1.1.1.1.2.2 MesaLib-7-7-1:1.1.1.2 netbsd-5-1-RC2:1.1.1.1.2.2 netbsd-5-1-RC1:1.1.1.1.2.2 MesaLib-7-4-4:1.1.1.2 netbsd-5:1.1.1.1.0.2 MesaLib-7-4-2:1.1.1.1 xorg:1.1.1; locks; strict; comment @# @; 1.2 date 2014.12.18.06.11.49; author mrg; state dead; branches; next 1.1; commitid Ae59RsLlS9l0cu2y; 1.1 date 2009.06.11.00.50.18; author mrg; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2009.06.11.00.50.18; author mrg; state Exp; branches 1.1.1.1.2.1; next 1.1.1.2; 1.1.1.2 date 2009.11.09.02.58.17; author mrg; state Exp; branches; next 1.1.1.3; 1.1.1.3 date 2010.07.19.05.31.36; author mrg; state Exp; branches; next 1.1.1.4; 1.1.1.4 date 2014.07.09.19.38.44; author riastradh; state Exp; branches 1.1.1.4.2.1; next ; commitid h96CLViPL8qdRJHx; 1.1.1.1.2.1 date 2009.06.11.00.50.18; author snj; state dead; branches; next 1.1.1.1.2.2; 1.1.1.1.2.2 date 2009.09.17.03.32.29; author snj; state Exp; branches; next ; 1.1.1.4.2.1 date 2015.01.06.09.26.34; author martin; state dead; branches; next ; commitid 2BxXkbQgg8gLEW4y; desc @@ 1.2 log @merge Mesa 10.3.5. @ text @# src/mesa/drivers/osmesa/Makefile for libOSMesa.so # Note that we may generate libOSMesa.so or libOSMesa16.so or libOSMesa32.so # with this Makefile TOP = ../../../.. include $(TOP)/configs/current SOURCES = osmesa.c OBJECTS = $(SOURCES:.c=.o) INCLUDE_DIRS = \ -I$(TOP)/include \ -I$(TOP)/src/mesa \ -I$(TOP)/src/mesa/main CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a .PHONY: osmesa8 .PHONY: osmesa16 .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) @@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ $(MAKE) osmesa16 ; \ else \ $(MAKE) osmesa8 ; \ fi # The normal libOSMesa is used in conjuction with libGL osmesa8: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ $(OSMESA_LIB_DEPS) $(OBJECTS) # The libOSMesa16/libOSMesa32 libraries do not use libGL but rather are built # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32 osmesa16: $(OBJECTS) $(CORE_MESA) $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) clean: -rm -f *.o *~ # XXX todo install rule? @ 1.1 log @Initial revision @ text @@ 1.1.1.1 log @initial import of MesaLib-7.4.2 @ text @@ 1.1.1.2 log @initial import of MesaLib-7.4.4 @ text @a21 2 # Standalone osmesa needs to be linked with core Mesa APIs ifeq ($(DRIVER_DIRS), osmesa) d23 4 a26 3 else CORE_MESA = endif d34 20 d56 3 a58 4 # libOSMesa can be used in conjuction with libGL or with all other Mesa # sources. We can also build libOSMesa16/libOSMesa32 by setting # -DCHAN_BITS=16/32. $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(CORE_MESA) @ 1.1.1.3 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 @d22 7 a28 5 CORE_MESA = \ $(TOP)/src/mesa/libmesa.a \ $(TOP)/src/mesa/libglapi.a \ $(TOP)/src/glsl/cl/libglslcl.a \ $(TOP)/src/glsl/pp/libglslpp.a @ 1.1.1.4 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 @a18 1 -I$(TOP)/src/mapi \ d24 3 a26 2 $(TOP)/src/mapi/glapi/libglapi.a \ $(TOP)/src/glsl/libglsl.a d39 1 a39 1 $(MKLIB) -o $(OSMESA_LIB) -linker '$(CXX)' -ldflags '$(LDFLAGS)' \ d41 1 a41 1 -install $(TOP)/$(LIB_DIR) -cplusplus $(MKLIB_OPTIONS) \ @ 1.1.1.4.2.1 log @File removals that accidently did not happen during pullup of the new MesaLib for ticket #381 @ text @@ 1.1.1.1.2.1 log @file Makefile was added on branch netbsd-5 on 2009-09-17 03:32:29 +0000 @ text @d1 71 @ 1.1.1.1.2.2 log @Apply patch (requested by mrg in ticket #958): Bring over X.Org updates from HEAD. @ text @a0 71 # src/mesa/drivers/osmesa/Makefile for libOSMesa.so # Note that we may generate libOSMesa.so or libOSMesa16.so or libOSMesa32.so # with this Makefile TOP = ../../../.. include $(TOP)/configs/current SOURCES = osmesa.c OBJECTS = $(SOURCES:.c=.o) INCLUDE_DIRS = \ -I$(TOP)/include \ -I$(TOP)/src/mesa \ -I$(TOP)/src/mesa/main CORE_MESA = $(TOP)/src/mesa/libmesa.a $(TOP)/src/mesa/libglapi.a .PHONY: osmesa8 .PHONY: osmesa16 .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@@ default: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) @@ if [ "${DRIVER_DIRS}" = "osmesa" ] ; then \ $(MAKE) osmesa16 ; \ else \ $(MAKE) osmesa8 ; \ fi # The normal libOSMesa is used in conjuction with libGL osmesa8: $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME) $(TOP)/$(LIB_DIR)/$(OSMESA_LIB_NAME): $(OBJECTS) $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ $(OSMESA_LIB_DEPS) $(OBJECTS) # The libOSMesa16/libOSMesa32 libraries do not use libGL but rather are built # with all the other Mesa sources (compiled with -DCHAN_BITS=16/32 osmesa16: $(OBJECTS) $(CORE_MESA) $(MKLIB) -o $(OSMESA_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major $(MESA_MAJOR) -minor $(MESA_MINOR) -patch $(MESA_TINY) \ -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ -id $(INSTALL_LIB_DIR)/lib$(OSMESA_LIB).$(MESA_MAJOR).dylib \ $(OSMESA_LIB_DEPS) $(OBJECTS) $(CORE_MESA) clean: -rm -f *.o *~ # XXX todo install rule? @