summaryrefslogtreecommitdiffstats
path: root/src/mesa/Android.mk
Commit message (Collapse)AuthorAgeFilesLines
* Android: fix x86 gallium buildsRob Herring2016-04-011-0/+1
| | | | | | | | | | | | | | | Builds with gallium enabled fail on x86 with linker error: external/mesa3d/src/mesa/vbo/vbo_exec_array.c:127: error: undefined reference to '_mesa_uint_array_min_max' The problem is sse_minmax.c is not included in the libmesa_st_mesa library. Since the SSE4.1 files are needed for both libmesa_st_mesa and libmesa_dricore, move SSE4.1 files into a separate static library that can be used by both. Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org> Signed-off-by: Rob Herring <robh@kernel.org> Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
* automake,android: Build program/ into a helper lib (v2)Eric Anholt2012-11-121-0/+2
| | | | | | | | | | While simplifying mesa/Makefile.am, the more important feature of this commit is allowing a file with the same name to appear in both main/ and program/. v2: [chadv] Add changes to Android makefiles. Reviewed-by: Kenneth Graunke <kenneth@whitecape.org> (v1) Signed-off-by: Chad Versace <chad.versace@linux.intel.com> (v2)
* android: Moves rules for libmesa_st_mesa to separate makefileChad Versace2012-11-121-49/+2
| | | | | | | | | | | The pair of files src/mesa/Android.mk and src/mesa/Android.gen.mk are too long and complex to be easily understood. This patch belongs to a series that decomposes them into several easily digestible makefiles. This patch move the rules for libmesa_st_mesa.a from Android.mk to Android.libmesa_st_mesa.mk. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
* android: Moves rules for libmesa_dricore to separate makefileChad Versace2012-11-121-29/+1
| | | | | | | | | | | The pair of files src/mesa/Android.mk and src/mesa/Android.gen.mk are too long and complex to be easily understood. This patch belongs to a series that decomposes them into several easily digestible makefiles. This patch move the rules for libmesa_dricore.a from Android.mk to Android.libmesa_dricore.mk. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
* android: Moves rules for mesa_gen_matypes to separate makefileChad Versace2012-11-121-17/+2
| | | | | | | | | | | The pair of files src/mesa/Android.mk and src/mesa/Android.gen.mk are too long and complex to be easily understood. This patch belongs to a series that decomposes them into several easily digestible makefiles. This patch move the rules for host executable mesa_gen_matypes from Android.mk to Android.mesa_gen_matypes.mk. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
* android: Moves rules for libmesa_glsl_utils to separate makefileChad Versace2012-11-121-32/+1
| | | | | | | | | | | The pair of files src/mesa/Android.mk and src/mesa/Android.gen.mk are too long and complex to be easily understood. This patch belongs to a series that decomposes them into several easily digestible makefiles. This patch move the rules for the host and target libmesa_glsl_utils.a from Android.mk to Android.libmesa_glsl_utils.mk. Signed-off-by: Chad Versace <chad.versace@linux.intel.com>
* automake: Merge separated *_CXX_FILES variables to *_FILES in core mesa.Eric Anholt2012-11-121-4/+0
| | | | | | | | They were always used with the corresponding *_FILES variables now that automake handles rule generation. Reviewed-by: Chad Versace <chad.versace@linux.intel.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* scons/android: add flag to check for enabled GL APIsImre Deak2012-10-101-5/+4
| | | | | | | | Needed by the next patch. Signed-off-by: Imre Deak <imre.deak@intel.com> Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Oliver McFadden <oliver.mcfadden@linux.intel.com>
* android-build: fix dricore build for autogenerated files (v3)Daniel Charles2012-07-261-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | Recently more files were removed from control to be auto-generated in the dricore library. Android build was not able to locate the new files if they were not created beforehand. LOCAL_SRC_FILES includes some of those files and Android.gen.mk re-defines this variable by filtering out the auto-generated files. Unfortunately for this variable it is not the same to have the SRCDIR variable defined as the current directory. By re-defining SRCDIR for the autotools build the Android build system is happy again and the new files were actually removed from the sources to use the auto generated versions. Also patch d5c1801a018efda8ac2b was partially reverted as the files can not be compiled to the LOCAL_PATH, instead they should live on the intermediates folder so that a clean can wipe them out. v3: [chad] Fix the definition of SRCDIR in libdricore/Makefile.am. Signed-off-by: Chad Versace <chad.versace@linux.intel.com> Signed-off-by: Daniel Charles <daniel.charles@intel.com>
* automake: Add a prefix variable to the common sources lists.Eric Anholt2012-05-291-0/+1
| | | | | | | | | | | In order to do the minimal change for libdricore conversion to automake, I need to put its Makefile.am in a subdirectory. Automake gets whiny/broken if you use GNU make features like "addprefix" or "$(FILES:%=../%)" to munge your *_SOURCES. So, use a plain old variable to be able to substitute in that "../" Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* automake: Rename variables in sources.mak to be automake compatible.Eric Anholt2012-05-291-10/+10
| | | | | | | | *_SOURCES is reserved for files lists for particular automake targets. Also, "-" in the variable names is not allowed. Reviewed-by: Matt Turner <mattst88@gmail.com> Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
* android: pass -std=c99 by defaultChia-I Wu2011-11-261-0/+2
| | | | | Several modules expect a C99 compiler already. It is also the default for Makefile build.
* make: Document imported variablesChad Versace2011-08-301-0/+6
| | | | | | | | In src/mesa/Android.mk, it is non-trivial to determine which variables are imported by `include sources.mak`. So document them. Reviewed-by: Chia-I Wu <olv@lunarg.com> Signed-off-by: Chad Versace <chad@chad-versace.us>
* mesa: Build libmesa_dricore.a for AndroidChad Versace2011-08-301-0/+29
| | | | | | | | libmesa_dricore.a is analogous to the libmesa.a built by the Autoconf build. Reviewed-by: Chia-I Wu <olv@lunarg.com> Signed-off-by: Chad Versace <chad@chad-versace.us>
* android: build glslChia-I Wu2011-08-211-0/+32
| | | | | | | This builds the static library libmesa_glsl and executable glsl_compiler from glsl. glsl_compiler is only installed for engineering build. Reviewed-by: Chad Versace <chad@chad-versace.us>
* android: build core mesaChia-I Wu2011-08-211-0/+83
This builds the static library libmesa_st_mesa from core mesa. Acked-by: Chad Versace <chad@chad-versace.us>