diff options
| author | Eric Anholt <eric@anholt.net> | 2012-05-29 14:55:40 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2012-06-11 09:28:00 -0700 |
| commit | 279efce8bb7b6c802eb6c1de46971153ff6fdedb (patch) | |
| tree | dba5bca1ef01018f1156bbbb3e3a8768fec97f5b /configs | |
| parent | 446faee094ae6f0a4914b59a9eb87077a1f7b3c5 (diff) | |
automake: Merge the dricore libglsl build into libdricore.
Now we have just one library of "all of Mesa core" instead of both
libdricore and libglsl that drivers link against.
I did this change in a sort of nonrecursive make fashion: the
generated files are still produced in the non-automake build, like the
rest of dricore, but the GLSL files are stuffed into libdricore
without building a convenience library in src/glsl (even though we
could now). This would make a bit more sense if glsl was just another
dir under src/mesa, because right now I had to contort the prefix
variable name to look another ../ level up.
Diffstat (limited to 'configs')
| -rw-r--r-- | configs/autoconf.in | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/configs/autoconf.in b/configs/autoconf.in index ce02ae6ebc1..48f4504a234 100644 --- a/configs/autoconf.in +++ b/configs/autoconf.in @@ -125,7 +125,6 @@ GALLIUM_DRIVERS = $(foreach DIR,$(GALLIUM_DRIVERS_DIRS),$(TOP)/src/gallium/drive # Driver specific build vars DRI_DIRS = @DRI_DIRS@ -DRICORE_GLSL_LIBS = @DRICORE_GLSL_LIBS@ DRICORE_LIBS = @DRICORE_LIBS@ DRICORE_LIB_DEPS = @DRICORE_LIB_DEPS@ EGL_PLATFORMS = @EGL_PLATFORMS@ |