diff options
| author | Chia-I Wu <[email protected]> | 2010-05-12 16:03:04 +0800 |
|---|---|---|
| committer | Chia-I Wu <[email protected]> | 2010-05-19 13:38:57 -0600 |
| commit | bc73a6289f5e28636d579e17e8a8d70a2d8d7500 (patch) | |
| tree | 94e8954e2337c9f0ad75cfcc32268357c9fdbd50 | |
| parent | 7f19b65b1ae4b68129b476b3089264ea9b25e6e6 (diff) | |
egl: Link drivers back to libEGL.
Drivers need symbols from libEGL. Without back-linking, the build fails
on Cygwin.
| -rw-r--r-- | src/egl/drivers/Makefile.template | 2 | ||||
| -rw-r--r-- | src/gallium/targets/Makefile.egl | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/egl/drivers/Makefile.template b/src/egl/drivers/Makefile.template index ca2f7d5b3ad..08e82c65e9b 100644 --- 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 f26ffb8ad4f..4f8641e0561 100644 --- 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 |