diff options
| author | Jon TURNEY <[email protected]> | 2012-01-22 13:23:26 +0000 |
|---|---|---|
| committer | Jon TURNEY <[email protected]> | 2012-01-23 18:24:39 +0000 |
| commit | 4e5a8937d1a1bfb2a3bd067ed01e036728675fc2 (patch) | |
| tree | 6749d933aac311ca27cb748639522d9ef790a0b9 | |
| parent | 0fce6d3a77f035753e2deebfc4c6bf2abe561314 (diff) | |
Fix underlinking in libOSMesa since commit adefee5 "Always build shared glapi"
Since we now always build shared glapi, this exposes the fact that libOSMesa was
underlinked when glapi was built shared.
Fix this by doing the same thing as drivers/X11/Makefile already does, ensuring
that the library is linked with the shared glapi library.
(I'm not clear why we link with both glapi.a and glapi.so, so this may be all wrong)
Signed-off-by: Jon TURNEY <[email protected]>
| -rw-r--r-- | src/mesa/drivers/osmesa/Makefile | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/drivers/osmesa/Makefile b/src/mesa/drivers/osmesa/Makefile index 39ab09af805..005f4d5ba55 100644 --- a/src/mesa/drivers/osmesa/Makefile +++ b/src/mesa/drivers/osmesa/Makefile @@ -25,6 +25,8 @@ CORE_MESA = \ $(TOP)/src/mapi/glapi/libglapi.a \ $(TOP)/src/glsl/libglsl.a +OSMESA_LIB_DEPS := -L$(TOP)/$(LIB_DIR) -l$(GLAPI_LIB) $(OSMESA_LIB_DEPS) + .c.o: $(CC) -c $(INCLUDE_DIRS) $(CFLAGS) $< -o $@ |