diff options
| author | Brian Paul <[email protected]> | 2008-06-09 16:06:44 -0600 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2008-06-09 16:06:44 -0600 |
| commit | 72f87b69471649ff02e80a89f902b69980f3d025 (patch) | |
| tree | 1e61dd272a81e640c6902119ea46981eab534f98 | |
| parent | f6246f85d7c87180b464f84f330385680a82a601 (diff) | |
fix Xlib libGL.so build problem.
Also, build driverfuncs.c into libmesa.a since it's always needed.
| -rw-r--r-- | src/mesa/drivers/dri/Makefile.template | 1 | ||||
| -rw-r--r-- | src/mesa/drivers/x11/Makefile | 2 | ||||
| -rw-r--r-- | src/mesa/sources | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/Makefile.template b/src/mesa/drivers/dri/Makefile.template index 53f9d80689e..07e181e2cd8 100644 --- a/src/mesa/drivers/dri/Makefile.template +++ b/src/mesa/drivers/dri/Makefile.template @@ -3,7 +3,6 @@ MESA_MODULES = $(TOP)/src/mesa/libmesa.a COMMON_SOURCES = \ - ../../common/driverfuncs.c \ ../common/utils.c \ ../common/texmem.c \ ../common/vblank.c \ diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile index ce5366e332e..51226eeae11 100644 --- a/src/mesa/drivers/x11/Makefile +++ b/src/mesa/drivers/x11/Makefile @@ -59,7 +59,7 @@ $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ -install $(TOP)/$(LIB_DIR) \ - $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) + $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA) diff --git a/src/mesa/sources b/src/mesa/sources index 122fdd1c04a..2db1843239c 100644 --- a/src/mesa/sources +++ b/src/mesa/sources @@ -253,6 +253,7 @@ MESA_SOURCES = \ $(SHADER_SOURCES) \ $(SWRAST_SOURCES) \ $(SWRAST_SETUP_SOURCES) \ + $(COMMON_DRIVER_SOURCES) \ $(ASM_C_SOURCES) \ $(SLANG_SOURCES) |