From: Matt Turner Date: Mon, 10 Sep 2012 18:21:26 +0000 (-0700) Subject: targets/egl-static: Convert to automake X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cdee0e808415214c27101103291a2be81eb02ad1;p=mesa.git targets/egl-static: Convert to automake v2: Andreas Boll - Provide compatibility with scripts for the old Mesa build system - Add missing Automake.inc v3: Johannes Obermayr - Fix linking. v4: Andreas Boll - Port changes from ff574d653b0731a324fd30324b0f211502219abf gallium/egl-static: Fix unresolved symbol 'clock_gettime' --- diff --git a/configure.ac b/configure.ac index 81c57cf2f46..6ad1ee98790 100644 --- a/configure.ac +++ b/configure.ac @@ -1398,6 +1398,7 @@ if test "x$enable_openvg" = xyes; then VG_PC_LIB_PRIV="-lm $CLOCK_LIB $PTHREAD_LIBS $DLOPEN_LIBS" AC_SUBST([VG_PC_LIB_PRIV]) fi +AM_CONDITIONAL(HAVE_OPENVG, test "x$enable_openvg" = xyes) dnl dnl D3D1X configuration @@ -1514,8 +1515,10 @@ AC_SUBST([CLANG_RESOURCE_DIR]) case "x$enable_opengl$enable_gles1$enable_gles2" in x*yes*) EGL_CLIENT_APIS="$EGL_CLIENT_APIS "'$(GL_LIB)' + HAVE_OPENGL=yes ;; esac +AM_CONDITIONAL(HAVE_OPENGL, test "x$HAVE_OPENGL" = xyes) AC_SUBST([VG_LIB_DEPS]) AC_SUBST([EGL_CLIENT_APIS]) @@ -2072,6 +2075,7 @@ AC_CONFIG_FILES([configs/current src/gallium/targets/dri-radeonsi/Makefile src/gallium/targets/dri-swrast/Makefile src/gallium/targets/dri-vmwgfx/Makefile + src/gallium/targets/egl-static/Makefile src/gallium/targets/opencl/Makefile src/gallium/targets/libgl-xlib/Makefile src/gallium/targets/vdpau-nouveau/Makefile diff --git a/src/gallium/targets/egl-static/.gitignore b/src/gallium/targets/egl-static/.gitignore new file mode 100644 index 00000000000..f3c7a7c5da6 --- /dev/null +++ b/src/gallium/targets/egl-static/.gitignore @@ -0,0 +1 @@ +Makefile diff --git a/src/gallium/targets/egl-static/Makefile b/src/gallium/targets/egl-static/Makefile deleted file mode 100644 index 0f41a215560..00000000000 --- a/src/gallium/targets/egl-static/Makefile +++ /dev/null @@ -1,215 +0,0 @@ -# src/gallium/targets/egl-static/Makefile -# -# This is Makefile for egl_gallium.so. It is static in that all state trackers -# and pipe drivers are linked statically when possible. -# -# The following variables are examined -# -# EGL_PLATFORMS - platforms to support -# EGL_CLIENT_APIS - state trackers to support -# GALLIUM_WINSYS_DIRS - pipe drivers to support -# SHARED_GLAPI - st/mesa can be statically linked or not -# - -TOP = ../../../.. -include $(TOP)/configs/current - -OUTPUTS := egl_gallium - -egl_CPPFLAGS := \ - -I$(TOP)/include \ - -I$(TOP)/src/gallium/auxiliary \ - -I$(TOP)/src/gallium/drivers \ - -I$(TOP)/src/gallium/include \ - -I$(TOP)/src/gallium/winsys -egl_LIBS := \ - $(TOP)/src/gallium/drivers/identity/libidentity.a \ - $(TOP)/src/gallium/drivers/trace/libtrace.a \ - $(TOP)/src/gallium/drivers/rbug/librbug.a \ - $(GALLIUM_AUXILIARIES) -egl_SYS := - -egl_SOURCES := \ - egl.c \ - egl_pipe.c \ - egl_st.c - -egl_OBJECTS := $(egl_SOURCES:%.c=%.o) - -# st/egl -egl_CPPFLAGS += \ - -I$(TOP)/src/gallium/state_trackers/egl \ - -I$(TOP)/src/egl/main \ - -D_EGL_MAIN=_eglMain -egl_LIBS += $(TOP)/src/gallium/state_trackers/egl/libegl.a -egl_SYS += $(LIBUDEV_LIBS) $(DLOPEN_LIBS) -lEGL -lm -lpthread - -# EGL platforms -ifneq ($(findstring x11, $(EGL_PLATFORMS)),) -egl_CPPFLAGS += $(LIBDRM_CFLAGS) -egl_LIBS += $(TOP)/src/gallium/winsys/sw/xlib/libws_xlib.a -egl_SYS += -lX11 -lXext -lXfixes $(LIBDRM_LIBS) -endif -ifneq ($(findstring wayland, $(EGL_PLATFORMS)),) -egl_CPPFLAGS += $(LIBDRM_CFLAGS) -egl_LIBS += $(TOP)/src/gallium/winsys/sw/wayland/libws_wayland.a -egl_LIBS += $(TOP)/src/egl/wayland/wayland-drm/.libs/libwayland-drm.a -egl_SYS += $(LIBDRM_LIBS) $(WAYLAND_LIBS) -endif -ifneq ($(findstring drm, $(EGL_PLATFORMS)),) -egl_CPPFLAGS += $(LIBDRM_CFLAGS) -egl_SYS += $(LIBDRM_LIBS) -lgbm -endif -ifneq ($(findstring fbdev, $(EGL_PLATFORMS)),) -egl_LIBS += $(TOP)/src/gallium/winsys/sw/fbdev/libfbdev.a -endif -ifneq ($(findstring null, $(EGL_PLATFORMS)),) -egl_LIBS += $(TOP)/src/gallium/winsys/sw/null/libws_null.a -endif - -# st/mesa -ifneq ($(filter $(GL_LIB), $(EGL_CLIENT_APIS)),) -egl_CPPFLAGS += -I$(TOP)/src/mesa $(API_DEFINES) -# make st/mesa built-in when there is a single glapi provider -ifeq ($(SHARED_GLAPI),1) -egl_LIBS += $(TOP)/src/mesa/libmesagallium.a -egl_SYS += -lm -lpthread $(CLOCK_LIB) $(DLOPEN_LIBS) -l$(GLAPI_LIB) -else -egl_CPPFLAGS += -D_EGL_EXTERNAL_GL=1 -OUTPUTS += st_GL -endif # SHARED_GLAPI -endif - -# st/vega -ifneq ($(filter $(VG_LIB), $(EGL_CLIENT_APIS)),) -egl_CPPFLAGS += -I$(TOP)/src/gallium/state_trackers/vega -DFEATURE_VG=1 -egl_LIBS += $(TOP)/src/gallium/state_trackers/vega/libvega.a -egl_SYS += -lm -l$(VG_LIB) -endif - -# i915 -ifneq ($(findstring i915/drm,$(GALLIUM_WINSYS_DIRS)),) -egl_CPPFLAGS += -D_EGL_PIPE_I915=1 -egl_LIBS += \ - $(TOP)/src/gallium/winsys/i915/drm/libi915drm.a \ - $(TOP)/src/gallium/drivers/i915/libi915.a -egl_SYS += $(INTEL_LIBS) -endif - -# nouveau -ifneq ($(findstring nouveau/drm,$(GALLIUM_WINSYS_DIRS)),) -egl_CPPFLAGS += -D_EGL_PIPE_NOUVEAU=1 -egl_LIBS += \ - $(TOP)/src/gallium/winsys/nouveau/drm/libnouveaudrm.a \ - $(TOP)/src/gallium/drivers/nv30/libnv30.a \ - $(TOP)/src/gallium/drivers/nv50/libnv50.a \ - $(TOP)/src/gallium/drivers/nvc0/libnvc0.a \ - $(TOP)/src/gallium/drivers/nouveau/libnouveau.a -egl_SYS += $(NOUVEAU_LIBS) -endif - -# r300 -ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) -ifneq ($(findstring r300,$(GALLIUM_DRIVERS_DIRS)),) -egl_CPPFLAGS += -D_EGL_PIPE_R300=1 -egl_LIBS += \ - $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ - $(TOP)/src/gallium/drivers/r300/libr300.a -egl_SYS += $(RADEON_LIBS) -endif -endif - -# r600 -ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) -ifneq ($(findstring r600,$(GALLIUM_DRIVERS_DIRS)),) -egl_CPPFLAGS += -D_EGL_PIPE_R600=1 -egl_LIBS += \ - $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ - $(TOP)/src/gallium/drivers/r600/libr600.a -egl_SYS += $(RADEON_LIBS) -endif -endif - -# radeonsi -ifneq ($(findstring radeon/drm,$(GALLIUM_WINSYS_DIRS)),) -ifneq ($(findstring radeonsi,$(GALLIUM_DRIVERS_DIRS)),) -egl_CPPFLAGS += -D_EGL_PIPE_RADEONSI=1 -egl_LIBS += \ - $(TOP)/src/gallium/winsys/radeon/drm/libradeonwinsys.a \ - $(TOP)/src/gallium/drivers/radeonsi/libradeonsi.a -egl_SYS += $(RADEON_LIBS) -endif -endif - -# vmwgfx -ifneq ($(findstring svga/drm,$(GALLIUM_WINSYS_DIRS)),) -egl_CPPFLAGS += -D_EGL_PIPE_VMWGFX=1 -egl_LIBS += \ - $(TOP)/src/gallium/winsys/svga/drm/libsvgadrm.a \ - $(TOP)/src/gallium/drivers/svga/libsvga.a -endif - -# softpipe -ifneq ($(findstring softpipe,$(GALLIUM_DRIVERS_DIRS)),) -egl_CPPFLAGS += -DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE -egl_LIBS += $(TOP)/src/gallium/drivers/softpipe/libsoftpipe.a -egl_SYS += -lm -endif - -# llvmpipe -ifneq ($(findstring llvmpipe,$(GALLIUM_DRIVERS_DIRS)),) -egl_CPPFLAGS += -DGALLIUM_LLVMPIPE -egl_LIBS += $(TOP)/src/gallium/drivers/llvmpipe/libllvmpipe.a -endif - -# sort to remove duplicates -egl_CPPFLAGS := $(sort $(egl_CPPFLAGS)) -egl_LIBS := $(sort $(egl_LIBS)) -egl_SYS := $(sort $(egl_SYS)) - -# st_GL, built only when shared glapi is not enabled -st_GL_CPPFLAGS := -I $(TOP)/src/mesa -I$(TOP)/src/gallium/include -st_GL_LIBS := $(TOP)/src/mesa/libmesagallium.a $(GALLIUM_AUXILIARIES) -st_GL_SYS := -lm -lpthread $(CLOCK_LIB) $(DLOPEN_LIBS) - -# LLVM -ifeq ($(MESA_LLVM),1) -egl_SYS += $(LLVM_LIBS) -LDFLAGS += $(LLVM_LDFLAGS) - -st_GL_SYS += $(LLVM_LIBS) -endif - -OUTPUT_PATH := $(TOP)/$(LIB_DIR)/egl -OUTPUTS := $(addprefix $(OUTPUT_PATH)/, $(addsuffix .so, $(OUTPUTS))) - -default: $(OUTPUTS) - -$(OUTPUT_PATH)/egl_gallium.so: $(egl_OBJECTS) $(egl_LIBS) - $(MKLIB) -o $(notdir $@) -noprefix -linker '$(CXX)' \ - -ldflags '-L$(TOP)/$(LIB_DIR) -Wl,--no-undefined $(LDFLAGS)' \ - -cplusplus -install $(OUTPUT_PATH) $(MKLIB_OPTIONS) \ - $(egl_OBJECTS) -Wl,--start-group $(egl_LIBS) -Wl,--end-group \ - $(egl_SYS) - -$(OUTPUT_PATH)/st_GL.so: st_GL.o $(st_GL_LIBS) - $(MKLIB) -o $(notdir $@) -noprefix -linker '$(CXX)' \ - -ldflags '-L$(TOP)/$(LIB_DIR) $(LDFLAGS)' \ - -cplusplus -install $(OUTPUT_PATH) $(MKLIB_OPTIONS) \ - $< -Wl,--start-group $(st_GL_LIBS) -Wl,--end-group \ - $(st_GL_SYS) - -$(egl_OBJECTS): %.o: %.c - $(CC) -c -o $@ $< $(egl_CPPFLAGS) $(DEFINES) $(CFLAGS) - -st_GL.o: st_GL.c - $(CC) -c -o $@ $< $(st_GL_CPPFLAGS) $(DEFINES) $(CFLAGS) - -install: $(OUTPUTS) - $(INSTALL) -d $(DESTDIR)$(EGL_DRIVER_INSTALL_DIR) - for out in $(OUTPUTS); do \ - $(MINSTALL) -m 755 "$$out" $(DESTDIR)$(EGL_DRIVER_INSTALL_DIR); \ - done - -clean: - rm -f *.o diff --git a/src/gallium/targets/egl-static/Makefile.am b/src/gallium/targets/egl-static/Makefile.am new file mode 100644 index 00000000000..59f2fc1722d --- /dev/null +++ b/src/gallium/targets/egl-static/Makefile.am @@ -0,0 +1,237 @@ +# Copyright © 2012 Intel Corporation +# +# Permission is hereby granted, free of charge, to any person obtaining a +# copy of this software and associated documentation files (the "Software"), +# to deal in the Software without restriction, including without limitation +# the rights to use, copy, modify, merge, publish, distribute, sublicense, +# and/or sell copies of the Software, and to permit persons to whom the +# Software is furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice (including the next +# paragraph) shall be included in all copies or substantial portions of the +# Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT +# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, +# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER +# DEALINGS IN THE SOFTWARE. + +# This is Makefile for egl_gallium.so. It is static in that all state trackers +# and pipe drivers are linked statically when possible. +# +# The following variables are examined +# +# EGL_PLATFORMS - platforms to support +# EGL_CLIENT_APIS - state trackers to support +# GALLIUM_WINSYS_DIRS - pipe drivers to support +# SHARED_GLAPI - st/mesa can be statically linked or not +# +include $(top_srcdir)/src/gallium/Automake.inc + +AM_CFLAGS = $(PTHREAD_CFLAGS) +AM_CPPFLAGS = \ + $(GALLIUM_CFLAGS) \ + -I$(top_srcdir)/include \ + -I$(top_srcdir)/src/gallium/drivers \ + -I$(top_srcdir)/src/gallium/winsys \ + -I$(top_srcdir)/src/gallium/include \ + -I$(top_srcdir)/src/gallium/auxiliary \ + -I$(top_srcdir)/src/gallium/state_trackers/egl \ + -I$(top_srcdir)/src/egl/main \ + -D_EGL_MAIN=_eglMain + +egldir = $(EGL_DRIVER_INSTALL_DIR) +egl_LTLIBRARIES = egl_gallium.la + +nodist_EXTRA_egl_gallium_la_SOURCES = dummy.cpp +egl_gallium_la_SOURCES = \ + egl.c \ + egl_pipe.c \ + egl_st.c + +egl_gallium_la_LIBADD = \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/gallium/drivers/identity/libidentity.la \ + $(top_builddir)/src/gallium/drivers/trace/libtrace.la \ + $(top_builddir)/src/gallium/drivers/rbug/librbug.la \ + $(top_builddir)/src/gallium/state_trackers/egl/libegl.la \ + $(top_builddir)/src/egl/main/libEGL.la \ + $(CLOCK_LIB) \ + $(LIBUDEV_LIBS) \ + $(DLOPEN_LIBS) \ + $(PTHREAD_LIBS) \ + -lm + +egl_gallium_la_LDFLAGS = -Wl,--no-undefined -Wl,--allow-multiple-definition -avoid-version -module + +if HAVE_EGL_PLATFORM_X11 +AM_CPPFLAGS += $(LIBDRM_CFLAGS) +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la \ + -lX11 -lXext -lXfixes $(LIBDRM_LIBS) +endif + +if HAVE_EGL_PLATFORM_WAYLAND +AM_CPPFLAGS += $(LIBDRM_CFLAGS) +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/sw/wayland/libws_wayland.la \ + $(top_builddir)/src/egl/wayland/wayland-drm/.libs/libwayland-drm.la \ + $(LIBDRM_LIBS) \ + $(WAYLAND_LIBS) +endif + +if HAVE_EGL_PLATFORM_DRM +AM_CPPFLAGS += $(LIBDRM_CFLAGS) +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gbm/libgbm.la \ + $(LIBDRM_LIBS) +endif + +if HAVE_EGL_PLATFORM_FBDEV +egl_gallium_la_LIBADD += $(top_builddir)/src/gallium/winsys/sw/fbdev/libfbdev.la +endif + +if HAVE_EGL_PLATFORM_NULL +egl_gallium_la_LIBADD += $(top_builddir)/src/gallium/winsys/sw/null/libws_null.la +endif + +if HAVE_OPENGL +AM_CPPFLAGS += \ + -I$(top_srcdir)/src/mesa \ + $(API_DEFINES) + +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/mesa/libmesagallium.la +# make st/mesa built-in when there is a single glapi provider +if HAVE_SHARED_GLAPI +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/mapi/shared-glapi/libglapi.la +else +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/mapi/glapi/libglapi.la + +AM_CPPFLAGS += -D_EGL_EXTERNAL_GL=1 +egl_LTLIBRARIES += st_GL.la + +nodist_EXTRA_st_GL_la_SOURCES = dummy.cpp +st_GL_la_SOURCES = st_GL.c +st_GL_la_LDFLAGS = -Wl,--no-undefined -avoid-version -module + +# st_GL, built only when shared glapi is not enabled +st_GL_la_LIBADD = \ + $(top_builddir)/src/mesa/libmesagallium.la \ + $(top_builddir)/src/gallium/auxiliary/libgallium.la \ + $(top_builddir)/src/mapi/glapi/libglapi.la \ + $(CLOCK_LIB) \ + $(DLOPEN_LIBS) \ + $(PTHREAD_LIBS) \ + -lm +endif +endif + +if HAVE_OPENVG +AM_CPPFLAGS += \ + -I$(top_srcdir)/src/gallium/state_trackers/vega \ + -DFEATURE_VG=1 +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/state_trackers/vega/libvega.la \ + $(top_builddir)/src/mapi/vgapi/libOpenVG.la +endif + +if HAVE_GALLIUM_I915 +AM_CPPFLAGS += -D_EGL_PIPE_I915=1 +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/i915/drm/libi915drm.la \ + $(top_builddir)/src/gallium/drivers/i915/libi915.la \ + $(INTEL_LIBS) +endif + +if HAVE_GALLIUM_NOUVEAU +AM_CPPFLAGS += -D_EGL_PIPE_NOUVEAU=1 +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/nouveau/drm/libnouveaudrm.la \ + $(top_builddir)/src/gallium/drivers/nv30/libnv30.la \ + $(top_builddir)/src/gallium/drivers/nv50/libnv50.la \ + $(top_builddir)/src/gallium/drivers/nvc0/libnvc0.la \ + $(top_builddir)/src/gallium/drivers/nouveau/libnouveau.la \ + $(NOUVEAU_LIBS) +endif + +if HAVE_GALLIUM_R300 +AM_CPPFLAGS += -D_EGL_PIPE_R300=1 +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ + $(top_builddir)/src/gallium/drivers/r300/libr300.la \ + $(RADEON_LIBS) +endif + +if HAVE_GALLIUM_R600 +AM_CPPFLAGS += -D_EGL_PIPE_R600=1 +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ + $(top_builddir)/src/gallium/drivers/r600/libr600.la \ + $(RADEON_LIBS) +endif + +if HAVE_GALLIUM_RADEONSI +AM_CPPFLAGS += -D_EGL_PIPE_RADEONSI=1 +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/radeon/drm/libradeonwinsys.la \ + $(top_builddir)/src/gallium/drivers/radeonsi/libradeonsi.la \ + $(RADEON_LIBS) +endif + +if HAVE_GALLIUM_SVGA +AM_CPPFLAGS += -D_EGL_PIPE_VMWGFX=1 +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/winsys/svga/drm/libsvgadrm.la \ + $(top_builddir)/src/gallium/drivers/svga/libsvga.la +endif + +if HAVE_GALLIUM_SOFTPIPE +AM_CPPFLAGS += -DGALLIUM_SOFTPIPE -DGALLIUM_RBUG -DGALLIUM_TRACE +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/drivers/softpipe/libsoftpipe.la +endif + +if HAVE_GALLIUM_LLVMPIPE +AM_CPPFLAGS += -DGALLIUM_LLVMPIPE +egl_gallium_la_LIBADD += \ + $(top_builddir)/src/gallium/drivers/llvmpipe/libllvmpipe.la +endif + +if HAVE_MESA_LLVM +egl_gallium_la_LIBADD += $(LLVM_LIBS) +egl_gallium_la_LDFLAGS += $(LLVM_LDFLAGS) + +if HAVE_OPENGL +if !HAVE_SHARED_GLAPI +st_GL_la_LIBADD += $(LLVM_LIBS) +st_GL_la_LDFLAGS += $(LLVM_LDFLAGS) +endif +endif +endif + +# Provide compatibility with scripts for the old Mesa build system for +# a while by putting a link to the driver into /lib of the build tree. +if HAVE_OPENGL +if !HAVE_SHARED_GLAPI +all-local: egl_gallium.la st_GL.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/egl + ln -f .libs/egl_gallium.so $(top_builddir)/$(LIB_DIR)/egl/egl_gallium.so + ln -f .libs/st_GL.so $(top_builddir)/$(LIB_DIR)/egl/st_GL.so +else +all-local: egl_gallium.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/egl + ln -f .libs/egl_gallium.so $(top_builddir)/$(LIB_DIR)/egl/egl_gallium.so + +endif +else +all-local: egl_gallium.la + $(MKDIR_P) $(top_builddir)/$(LIB_DIR)/egl + ln -f .libs/egl_gallium.so $(top_builddir)/$(LIB_DIR)/egl/egl_gallium.so +endif