diff options
| author | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
|---|---|---|
| committer | Julien Cristau <[email protected]> | 2008-07-13 19:20:03 +0200 |
| commit | 64e57ed257c559ea31cf162c67a7ef61fdc562e4 (patch) | |
| tree | dee99970e9d1e6d892f21db31488470bc7929d18 /src/egl/drivers/demo | |
| parent | dabd09f5a92e5497ac6ac9b4ba26f806ddb25206 (diff) | |
| parent | 4fab47b13c214dc79e0ae5d8001521029ce34231 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesa into debian-experimental
Conflicts:
progs/tests/antialias.c
progs/tools/trace/Makefile
Diffstat (limited to 'src/egl/drivers/demo')
| -rw-r--r-- | src/egl/drivers/demo/Makefile | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/egl/drivers/demo/Makefile b/src/egl/drivers/demo/Makefile index 9653c8805cc..6ca25aa5d65 100644 --- a/src/egl/drivers/demo/Makefile +++ b/src/egl/drivers/demo/Makefile @@ -21,8 +21,9 @@ default: $(TOP)/$(LIB_DIR)/demodriver.so $(TOP)/$(LIB_DIR)/demodriver.so: $(OBJECTS) - $(TOP)/bin/mklib -o demodriver.so -noprefix -ldflags '$(LDFLAGS)' \ - -install $(TOP)/$(LIB_DIR) $(OBJECTS) + $(MKLIB) -o demodriver.so -noprefix -linker '$(CC)' \ + -ldflags '$(LDFLAGS)' -install $(TOP)/$(LIB_DIR) \ + $(OBJECTS) |