OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

build: remove unused API_DEFINES

Browse Source 
Reviewed-by: Matt Turner <mattst88@gmail.com>
This commit is contained in:
Andreas Boll
2013-02-27 10:10:14 +01:00
parent 7f8434b866
commit be0fec4f5b
16 changed files with 6 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
configure.ac
View File

@@ -687,9 +687,6 @@ if test "x$enable_opengl" = xno -a \
AC_MSG_ERROR([Building OpenGL ES2 without OpenGL is not supported]) AC_MSG_ERROR([Building OpenGL ES2 without OpenGL is not supported])
fi fi
API_DEFINES=""
AC_SUBST([API_DEFINES])
AM_CONDITIONAL(HAVE_OPENGL, test "x$enable_opengl" = xyes) AM_CONDITIONAL(HAVE_OPENGL, test "x$enable_opengl" = xyes)
AM_CONDITIONAL(HAVE_OPENGL_ES1, test "x$enable_gles1" = xyes) AM_CONDITIONAL(HAVE_OPENGL_ES1, test "x$enable_gles1" = xyes)
AM_CONDITIONAL(HAVE_OPENGL_ES2, test "x$enable_gles2" = xyes) AM_CONDITIONAL(HAVE_OPENGL_ES2, test "x$enable_gles2" = xyes)

3
src/glsl/Makefile.am
View File

@@ -27,8 +27,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/glsl/glcpp \ -I$(top_srcdir)/src/glsl/glcpp \
-I$(top_srcdir)/src/gtest/include \ -I$(top_srcdir)/src/gtest/include \
$(DEFINES) \ $(DEFINES)
$(API_DEFINES)
AM_CFLAGS = $(VISIBILITY_CFLAGS) AM_CFLAGS = $(VISIBILITY_CFLAGS)
AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)

2
src/mesa/Makefile.am
View File

@@ -93,7 +93,7 @@ SRCDIR = $(top_srcdir)/src/mesa/
BUILDDIR = $(top_builddir)/src/mesa/ BUILDDIR = $(top_builddir)/src/mesa/
include Makefile.sources include Makefile.sources
AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS) AM_CFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CFLAGS)
AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS) AM_CXXFLAGS = $(LLVM_CFLAGS) $(VISIBILITY_CXXFLAGS)

1
src/mesa/drivers/dri/common/Makefile.am
View File

@@ -27,7 +27,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
$(DEFINES) \ $(DEFINES) \
$(API_DEFINES) \
$(LIBDRM_CFLAGS) \ $(LIBDRM_CFLAGS) \
$(VISIBILITY_CFLAGS) $(VISIBILITY_CFLAGS)

1
src/mesa/drivers/dri/nouveau/Makefile.am
View File

@@ -30,7 +30,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/common \
$(DEFINES) \ $(DEFINES) \
$(API_DEFINES) \
$(VISIBILITY_CFLAGS) \ $(VISIBILITY_CFLAGS) \
$(NOUVEAU_CFLAGS) $(NOUVEAU_CFLAGS)

1
src/mesa/drivers/dri/r200/Makefile.am
View File

@@ -33,7 +33,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/r200/server \ -I$(top_srcdir)/src/mesa/drivers/dri/r200/server \
-I$(top_builddir)/src/mesa/drivers/dri/common \ -I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \ $(DEFINES) \
$(API_DEFINES) \
$(VISIBILITY_CFLAGS) \ $(VISIBILITY_CFLAGS) \
$(RADEON_CFLAGS) $(RADEON_CFLAGS)

1
src/mesa/drivers/dri/radeon/Makefile.am
View File

@@ -33,7 +33,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \ -I$(top_srcdir)/src/mesa/drivers/dri/radeon/server \
-I$(top_builddir)/src/mesa/drivers/dri/common \ -I$(top_builddir)/src/mesa/drivers/dri/common \
$(DEFINES) \ $(DEFINES) \
$(API_DEFINES) \
$(VISIBILITY_CFLAGS) \ $(VISIBILITY_CFLAGS) \
$(RADEON_CFLAGS) $(RADEON_CFLAGS)

1
src/mesa/drivers/dri/swrast/Makefile.am
View File

@@ -31,7 +31,6 @@ AM_CFLAGS = \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
-I$(top_srcdir)/src/mesa/drivers/dri/common \ -I$(top_srcdir)/src/mesa/drivers/dri/common \
$(DEFINES) \ $(DEFINES) \
$(API_DEFINES) \
$(VISIBILITY_CFLAGS) $(VISIBILITY_CFLAGS)
dridir = $(DRI_DRIVER_INSTALL_DIR) dridir = $(DRI_DRIVER_INSTALL_DIR)

3
src/mesa/drivers/osmesa/Makefile.am
View File

@@ -26,8 +26,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mapi \
-I$(top_builddir)/src/mapi \ -I$(top_builddir)/src/mapi \
-I$(top_srcdir)/src/mesa/ \ -I$(top_srcdir)/src/mesa/ \
$(DEFINES) \ $(DEFINES)
$(API_DEFINES)
AM_CFLAGS = $(PTHREAD_CFLAGS) \ AM_CFLAGS = $(PTHREAD_CFLAGS) \
$(VISIBILITY_CFLAGS) $(VISIBILITY_CFLAGS)
AM_CXXFLAGS = $(PTHREAD_CFLAGS) \ AM_CXXFLAGS = $(PTHREAD_CFLAGS) \

1
src/mesa/drivers/x11/Makefile.am
View File

@@ -29,7 +29,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mesa/main \ -I$(top_srcdir)/src/mesa/main \
$(X11_INCLUDES) \ $(X11_INCLUDES) \
$(API_DEFINES) \
$(DEFINES) $(DEFINES)
if HAVE_X11_DRIVER if HAVE_X11_DRIVER

1
src/mesa/libdricore/Makefile.am
View File

@@ -28,7 +28,6 @@ noinst_PROGRAMS =
AM_CPPFLAGS = \ AM_CPPFLAGS = \
$(INCLUDE_DIRS) \ $(INCLUDE_DIRS) \
$(API_DEFINES) \
$(DEFINES) \ $(DEFINES) \
-DUSE_DRICORE -DUSE_DRICORE

2
src/mesa/main/tests/Makefile.am
View File

@@ -8,7 +8,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mapi \
-I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
$(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) $(DEFINES) $(INCLUDE_DIRS)
TESTS = main-test TESTS = main-test
check_PROGRAMS = main-test check_PROGRAMS = main-test

2
src/mesa/main/tests/hash_table/Makefile.am
View File

@@ -21,7 +21,7 @@
AM_CPPFLAGS = \ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/mesa/main \ -I$(top_srcdir)/src/mesa/main \
$(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) $(DEFINES) $(INCLUDE_DIRS)
LDADD = \ LDADD = \
$(top_builddir)/src/mesa/libmesa.la \ $(top_builddir)/src/mesa/libmesa.la \

2
src/mesa/program/Makefile.am
View File

@@ -21,7 +21,7 @@
include ../Makefile.sources include ../Makefile.sources
AM_CPPFLAGS = $(API_DEFINES) $(DEFINES) $(INCLUDE_DIRS) AM_CPPFLAGS = $(DEFINES) $(INCLUDE_DIRS)
AM_CFLAGS = $(VISIBILITY_CFLAGS) AM_CFLAGS = $(VISIBILITY_CFLAGS)
AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS) AM_CXXFLAGS = $(VISIBILITY_CXXFLAGS)
libdricore_program_la_CFLAGS = $(NOVISIBILITY_CFLAGS) libdricore_program_la_CFLAGS = $(NOVISIBILITY_CFLAGS)

1
src/mesa/x86-64/Makefile.am
View File

@@ -25,7 +25,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mapi \
$(API_DEFINES) \
$(DEFINES) $(DEFINES)
noinst_PROGRAMS = gen_matypes noinst_PROGRAMS = gen_matypes

1
src/mesa/x86/Makefile.am
View File

@@ -25,7 +25,6 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/src/mesa \ -I$(top_srcdir)/src/mesa \
-I$(top_srcdir)/src/mapi \ -I$(top_srcdir)/src/mapi \
$(API_DEFINES) \
$(DEFINES) $(DEFINES)
noinst_PROGRAMS = gen_matypes noinst_PROGRAMS = gen_matypes