projects / mesa.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7f19b65)
egl: Link drivers back to libEGL.
authorChia-I Wu <olv@lunarg.com>
Wed, 12 May 2010 08:03:04 +0000 (16:03 +0800)
committerChia-I Wu <olv@lunarg.com>
Wed, 19 May 2010 19:38:57 +0000 (13:38 -0600)
Drivers need symbols from libEGL.  Without back-linking, the build fails
on Cygwin.

src/egl/drivers/Makefile.template patch | blob | history
src/gallium/targets/Makefile.egl patch | blob | history

diff --git a/src/egl/drivers/Makefile.template b/src/egl/drivers/Makefile.template
index ca2f7d5b3ad03f0d70fdc45d3eaf75b100e9afcf..08e82c65e9beb964586a8cae3f4ee40f8c7b7561 100644 (file)
--- a/src/egl/drivers/Makefile.template
+++ b/src/egl/drivers/Makefile.template
@@ -26,7 +26,7 @@ $(EGL_DRIVER): $(EGL_OBJECTS) Makefile $(TOP)/src/egl/drivers/Makefile.template
        @$(MKLIB) -o $(EGL_DRIVER) -noprefix \
                -linker '$(CC)' -ldflags '$(LDFLAGS)' \
                -L$(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \
-               $(EGL_OBJECTS) $(EGL_LIBS)
+               $(EGL_OBJECTS) $(EGL_LIBS) -l$(EGL_LIB)
 
 .c.o:
        $(CC) -c $(EGL_INCLUDES) $(CFLAGS) $(EGL_CFLAGS) $< -o $@
diff --git a/src/gallium/targets/Makefile.egl b/src/gallium/targets/Makefile.egl
index f26ffb8ad4f4da5602eb5930ca324a84d2dd0f31..4f8641e056169dc004f3433e134b121dd587f831 100644 (file)
--- a/src/gallium/targets/Makefile.egl
+++ b/src/gallium/targets/Makefile.egl
@@ -56,7 +56,7 @@ $(MKLIB) -o $@ -noprefix -linker '$(CC)' -ldflags '$(LDFLAGS)' \
        $(MKLIB_OPTIONS) $(EGL_DRIVER_OBJECTS) \
        -Wl,--start-group $($(1)_ST) $(EGL_DRIVER_PIPES) \
        $(GALLIUM_AUXILIARIES) -Wl,--end-group \
-       $($(1)_LIBS) $(EGL_DRIVER_LIBS)
+       $($(1)_LIBS) $(EGL_DRIVER_LIBS) -L$(TOP)/$(LIB_DIR) -l$(EGL_LIB)
 endef
 
 egl_x11_$(EGL_DRIVER_NAME).so: $(EGL_DRIVER_OBJECTS) $(x11_ST) $(EGL_DRIVER_PIPES) $(GALLIUM_AUXILIARIES) Makefile