diff options
| author | Ian Romanick <[email protected]> | 2008-07-25 18:31:44 -0700 |
|---|---|---|
| committer | Ian Romanick <[email protected]> | 2008-07-25 18:31:44 -0700 |
| commit | 1e645b365900cf1c71ca5594bd6b549a1f203040 (patch) | |
| tree | d114e55df428550c9829acf929b9fb7bcb89c429 /src/mesa/drivers/x11/Makefile | |
| parent | e5022c3fdf9888857f22f9a1690035ff3f90d36b (diff) | |
| parent | 9bc9e0ecb0fb2069b2c123e665eb2118e358098f (diff) | |
Merge branch 'master' into drm-gem
Conflicts:
src/mesa/drivers/dri/common/dri_bufmgr.c
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
Diffstat (limited to 'src/mesa/drivers/x11/Makefile')
| -rw-r--r-- | src/mesa/drivers/x11/Makefile | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mesa/drivers/x11/Makefile b/src/mesa/drivers/x11/Makefile index 51226eeae11..b025246e634 100644 --- a/src/mesa/drivers/x11/Makefile +++ b/src/mesa/drivers/x11/Makefile @@ -55,11 +55,10 @@ default: $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(CORE_MESA) - @ $(TOP)/bin/mklib -o $(GL_LIB) \ - -linker '$(CC)' -ldflags '$(LDFLAGS)' \ + @ $(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \ -major $(GL_MAJOR) -minor $(GL_MINOR) -patch $(GL_TINY) \ - -install $(TOP)/$(LIB_DIR) \ - $(MKLIB_OPTIONS) $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA) + -install $(TOP)/$(LIB_DIR) $(MKLIB_OPTIONS) \ + $(GL_LIB_DEPS) $(OBJECTS) $(CORE_MESA) |