summaryrefslogtreecommitdiffstats
path: root/src/mesa/Makefile
Commit message (Collapse)AuthorAgeFilesLines
* automake: Move the master Mesa makefile to Makefile.old.Eric Anholt2012-06-211-205/+0
| | | | | This will let me incrementally move stuff to automake without converting libmesa.a all at once.
* automake: Convert osmesa.pc to be generated by configure.Eric Anholt2012-06-211-17/+1
|
* mesa: Convert gl.pc to be generated by configure.Eric Anholt2012-06-211-14/+2
| | | | This saves a step of mashing variables around in our Makefile.
* automake: Convert src/mesa/drivers/x11/Makefile to automake.Eric Anholt2012-06-211-5/+1
| | | | | | | | | The weird versioning of the libGL where the package version was sort of expressed as a big integer is dropped. libtool didn't like the 0 prefix, and it didn't really make sense anyway -- if you interpret it as an integer version number, old Mesa 071200 was bigger than current Mesa 08100. Instead, just bump the minor version and drop the patchlevel.
* automake: Convert gen_matypes building to automake.Eric Anholt2012-06-211-1/+0
|
* make: Fold ASM_CFLAGS into DEFINES.Eric Anholt2012-06-211-2/+2
| | | | | | Every place that uses ASM_FLAGS already uses DEFINES. Not including it in DEFINES is just a way to screw up potential users, as I've done several times while working on the build system.
* mesa: Build git_sha1.h before computing dependencies.Eric Anholt2012-06-121-1/+1
| | | | | | | | | Otherwise, version.c doesn't get a dependency on it in a clean build, and then it doesn't necessarily get generated before version.c is compiled. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50976 Reviewed-by: Jakob Bornecrantz [email protected]
* automake: Move top-level makefile to automake.Eric Anholt2012-06-111-0/+17
| | | | | | | | | This is part of a series to fix our build issues in the automake case by hooking up the automatic Makefile regeneration support. The extract_git_sha1 is moved into src/mesa/Makefile so that we get correct dependency generation. Reviewed-by: Kenneth Graunke <[email protected]>
* automake: Connect the libdricore target to make clean.Eric Anholt2012-06-011-0/+1
| | | | | Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=50480 Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: Clean up some dricore-related detritus in the old Makefile.Eric Anholt2012-05-291-23/+7
| | | | | Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* automake: Convert dricore building to automake.Eric Anholt2012-05-291-42/+12
| | | | | | | | | | | This is performed in a subdirectory to avoid needing to convert all of src/mesa/Makefile in one go. I can now cherry-pick a commit containing glapi XML changes, do "(cd src/mapi/glapi/gen && make) && make", and get a working driver. Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* 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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* automake: Rename variables in sources.mak to be automake compatible.Eric Anholt2012-05-291-3/+3
| | | | | | | | *_SOURCES is reserved for files lists for particular automake targets. Also, "-" in the variable names is not allowed. Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: Remove generated source files during make clean.Eric Anholt2012-05-291-0/+12
| | | | | Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* mesa: Restore installing of libGL for non-dri builds.Eric Anholt2012-05-291-3/+7
| | | | | | Reported-by: Sven Joachim <[email protected]> Reviewed-by: Matt Turner <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]>
* glx: Convert to automake.Eric Anholt2012-02-291-2/+0
| | | | Reviewed-by: Kenneth Graunke <[email protected]>
* Revert "automake: src/mesa/drivers/osmesa"Matt Turner2012-01-311-2/+15
| | | | This reverts commit 275ac7e5c1fd6c1847a428192fe259e50690fced.
* automake: src/mesa/drivers/osmesaMatt Turner2012-01-301-15/+2
|
* glapi: generate ES dispatch headers from core mesaChia-I Wu2011-08-131-0/+20
| | | | | | | | | | GLESv1 and GLESv2 have their own dispatch.h and remap_helper.h. These headers are only used by api_exec_es1.c and api_exec_es2.c in core mesa. Move the rules to generate them from glapi to core mesa. Reviewed-by: Brian Paul <[email protected]> [olv: updated after reviewing to fix SCons build]
* Add dependency generation for Mesa and GLSL dricore objects.Eric Anholt2011-07-281-2/+3
| | | | | Reviewed-By: Christopher James Halse Rogers <[email protected]>
* mesa: check that flex/bison are installedBrian Paul2011-05-181-2/+2
| | | | | | Fixes https://bugs.freedesktop.org/show_bug.cgi?id=36651 NOTE: This is a candidate for the 7.10 branch.
* autoconf: don't use CFLAGS for cpp filesTobias Droste2011-03-161-1/+1
| | | | Signed-off-by: Tobias Droste <[email protected]>
* mesa: Fix build breakage caused by c73e6ceIan Romanick2011-03-011-0/+6
|
* mesa: Optionally build a dricore support library (v3)Christopher James Halse Rogers2011-02-111-8/+44
| | | | | | | | | | | | | | | | | This an adds --enable-shared-dricore option to configure. When enabled, DRI modules will link against a shared copy of the common mesa routines rather than statically linking these. This saves about 30MB on disc with a full complement of classic DRI drivers. v2: Only enable with a gcc-compatible compiler that handles rpath Handle DRI_CFLAGS without filter-out magic Build shared libraries with the full mklib voodoo Fix typos v3: Resolve conflicts with talloc removal patches Signed-off-by: Christopher James Halse Rogers <[email protected]>
* Remove talloc from the make and automake build systems.Kenneth Graunke2011-01-311-1/+1
|
* Export TLS support in gl.pc.Tom Fogal2011-01-101-0/+1
|
* mesa: Remove GLES overlay.Chia-I Wu2011-01-101-75/+2
| | | | | | | With core mesa doing runtime API checks, GLES overlay is no longer needed. Make --enable-gles-overlay equivalent to --enable-gles[12]. There may still be places where compile-time checks are done. They could be fixed case by case.
* mesa: Add talloc includes for glesThomas Hellstrom2010-11-091-2/+2
| | | | Signed-off-by: Thomas Hellstrom <[email protected]>
* mesa: Make sure we have the talloc cflags when using the talloc headersThomas Hellstrom2010-10-191-1/+1
| | | | Signed-off-by: Thomas Hellstrom <[email protected]>
* mesa: Fix depend.es[12] generation when LLVM is enabled.Chia-I Wu2010-09-121-29/+26
| | | | | | "llvm-config --cflags" outputs -f options, which conflict makedepend. Clean up compiler flags and append LLVM_CFLAGS to the new xxx_CFLAGS instead of xxx_CPPFLAGS, where xxx may be MESA, ES1, or ES2.
* mesa: fix es1/2 build hopefullyDave Airlie2010-08-171-0/+8
| | | | needed to add cpp rules and includes properly for es1/es2
* Merge remote branch 'origin/master' into glsl2Eric Anholt2010-07-261-0/+7
|\ | | | | | | | | | | | | | | | | | | | | This pulls in multiple i965 driver fixes which will help ensure better testing coverage during development, and also gets past the conflicts of the src/mesa/shader -> src/mesa/program move. Conflicts: src/mesa/Makefile src/mesa/main/shaderapi.c src/mesa/main/shaderobj.h
| * gallium: Fix build with llvm installed in non-standard locationChristopher James Halse Rogers2010-07-231-0/+7
| | | | | | | | | | | | | | | | | | | | The es1, es2 and gl state trackers include draw_pipe.h, which includes the llvm headers if MESA_LLVM is true, so we also need to add the llvm seachpaths. Similarly, gallivm and other gallium drivers need LLVM_CFLAGS to build when enabled. Also fix xorg drivers, they didn't include LDFLAGS.
| * mesa: move shader/slang/* sources to main/slang/*Brian Paul2010-06-101-2/+2
| | | | | | | | Reduce the source tree depth a bit.
* | glsl2: Start integrating ir_to_mesa.cpp into shader_api.hEric Anholt2010-06-251-0/+2
| | | | | | | | | | | | The compiler is now called by the driver, and generates program instructions. Parameter lists are still not set up, so the driver chokes on it shortly thereafter.
* | glsl2: Replace the GLSL compiler with the glsl2 project.Eric Anholt2010-06-241-9/+10
|/
* Update OpenGL ES headers.Chia-I Wu2010-05-311-2/+2
|
* mesa/es: Merge back to core mesa.Chia-I Wu2010-05-121-14/+90
| | | | | | With the omit list gone, there are not too many differences in building core mesa and ES overlay. Remove the mesa/es and build both of them in src/mesa/Makefile.
* mesa: Optimize get.c by using a table-driven approachKristian Høgsberg2010-05-111-6/+0
|
* mapi: Add install rules for OpenGL ES.Chia-I Wu2010-05-081-46/+0
| | | | Move the install rules for OpenGL ES from src/mesa/Makefile to mapi.
* glapi: Move to src/mapi/.Chia-I Wu2010-05-071-15/+4
| | | | Move glapi to src/mapi/{glapi,es1api,es2api}.
* Generate es glapi files when es1 or es2 is enabledKristian Høgsberg2010-05-031-1/+7
|
* Hook in install rules for es1 and es2Kristian Høgsberg2010-05-021-0/+6
|
* Add glesv2.pc and glesv1_cm.pc pkg-config files for ES 1 and 2Kristian Høgsberg2010-05-021-6/+22
|
* gles: Build libGLESv1_CM.so and libGLESv2.so from glapi filesKristian Høgsberg2010-04-281-0/+24
|
* configure.ac: Add options to enable GLES1/2 API supportKristian Høgsberg2010-04-281-0/+1
|
* mesa: Move get_es*.c to main/Kristian Høgsberg2010-04-271-0/+5
|
* mesa: Move api_exec_es*.c into mesa/mainKristian Høgsberg2010-04-271-0/+6
| | | | | This requires renaming a few functions to have unique names so that they can all live within the same driver.
* mesa: remove libmesagallium.a on make cleanMarcin Slusarz2010-02-271-1/+1
| | | | Signed-off-by: José Fonseca <[email protected]>
* mesa: silence mklib output for libglapi.c as for other targetsBrian Paul2010-02-181-1/+1
|