preprocessor fixes

diff --git a/scripts/Makefile b/scripts/Makefile
index 2118d706b99b7a7ec868112e2270311ea53f2237..a4bfcefb07bdabac7b5f7bf8f49f21a1016fd859 100644 (file)
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -1,9 +1,9 @@
 INFILES = $(wildcard *.shader.in)
 GENERATEDFILES = $(patsubst %.shader.in,%.shader,$(INFILES))
 
-all: $(GENERATEDFILES)
+all: shaderlist.txt $(GENERATEDFILES)
 
-%.shader: shaderlist.txt %.shader.in
+%.shader: %.shader.in
        ./shader-cpp.sh "$<" > "$@"
 
 clean:

diff --git a/scripts/shader-cpp.sh b/scripts/shader-cpp.sh
index 202987adb914e9a79ca8ed07dad5b45495eb1bc1..3c1b83c063ba73cc893a8f1d4a3d1f1eae99b989 100755 (executable)
--- a/scripts/shader-cpp.sh
+++ b/scripts/shader-cpp.sh
@@ -106,7 +106,7 @@ preprocess()
                                        *0*)
                                                ;;
                                        *)
-                                               echo "$L"
+                                               echo "${L% }"
                                                ;;
                                esac
                                ;;