diff options
| author | michal <michal@transistor.(none)> | 2009-12-10 01:03:15 +0100 |
|---|---|---|
| committer | michal <michal@transistor.(none)> | 2009-12-10 01:03:15 +0100 |
| commit | 068596c9a7e8d330ffdff8ad8700bd6093b5bdea (patch) | |
| tree | 9a7cab7a0c44d83169f59ac3aa4ac2b60e8c7acb /src/mesa/Makefile | |
| parent | 77a0a3e5ca5dfa951056d9054b4147e3ea0965f3 (diff) | |
Build mesa glsl with make.
Still don't know how to add glsl to mesa dependencies.
Diffstat (limited to 'src/mesa/Makefile')
| -rw-r--r-- | src/mesa/Makefile | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/mesa/Makefile b/src/mesa/Makefile index 8300b30144..67cac2d248 100644 --- a/src/mesa/Makefile +++ b/src/mesa/Makefile @@ -19,10 +19,10 @@ include sources.mak -# Default: build dependencies, then asm_subdirs, then convenience -# libs (.a) and finally the device drivers: -default: depend asm_subdirs libmesa.a libmesagallium.a libglapi.a \ - driver_subdirs +# Default: build dependencies, then asm_subdirs, GLSL built-in lib, +# then convenience libs (.a) and finally the device drivers: +default: depend asm_subdirs glsl_builtin libmesa.a libmesagallium.a \ + libglapi.a driver_subdirs @@ -64,6 +64,12 @@ asm_subdirs: ###################################################################### +# GLSL built-in library +glsl_builtin: + (cd shader/slang/library && $(MAKE)) || exit 1 ; + + +###################################################################### # Dependency generation depend: $(ALL_SOURCES) @@ -156,6 +162,7 @@ clean: -rm -f depend depend.bak libmesa.a libglapi.a -rm -f drivers/*/*.o -rm -f *.pc + -rm -f shader/slang/library/*_gc.h -@cd drivers/dri && $(MAKE) clean -@cd drivers/x11 && $(MAKE) clean -@cd drivers/osmesa && $(MAKE) clean |