Merge branch 'master' into matthiaskrgr/surfaceparm_alphashadow

diff --git a/scripts/Makefile b/scripts/Makefile
index a4bfcefb07bdabac7b5f7bf8f49f21a1016fd859..ba99e8efd406081d28424c547e1ae5c8de92ea31 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -7,7 +7,8 @@ all: shaderlist.txt $(GENERATEDFILES)
        ./shader-cpp.sh "$<" > "$@"
 
 clean:
-       $(RM) "$(GENERATEDFILES)"
+       $(RM) $(GENERATEDFILES)
 
+.PHONY: shaderlist.txt
 shaderlist.txt:
        ls -1 *.shader | cut -d . -f 1 > "$@"

diff --git a/scripts/shaderlist.txt b/scripts/shaderlist.txt
index ce08e64fa30fc21047b8ed20835efe99733f7fe8..fd5f8f51921afbd225fd965842cf301f4b60326b 100644 (file)
--- a/scripts/shaderlist.txt
+++ b/scripts/shaderlist.txt
@@ -24,6 +24,7 @@ map_glowplant
 map_leave_em_behind
 map_lightspeed
 map_newtonian-nightmare
+map_oilrig
 map_red-planet
 map_silentsiege
 map_solarium