summaryrefslogtreecommitdiff
path: root/src/glsl
diff options
context:
space:
mode:
Diffstat (limited to 'src/glsl')
-rw-r--r--src/glsl/SConscript2
-rw-r--r--src/glsl/apps/.gitignore5
-rw-r--r--src/glsl/cl/sl_cl_parse.c2
3 files changed, 8 insertions, 1 deletions
diff --git a/src/glsl/SConscript b/src/glsl/SConscript
index 101487df91..8e18626c40 100644
--- a/src/glsl/SConscript
+++ b/src/glsl/SConscript
@@ -23,7 +23,7 @@ sources = [
'cl/sl_cl_parse.c',
]
-glsl = env.StaticLibrary(
+glsl = env.ConvenienceLibrary(
target = 'glsl',
source = sources,
)
diff --git a/src/glsl/apps/.gitignore b/src/glsl/apps/.gitignore
new file mode 100644
index 0000000000..7e011ce7a1
--- /dev/null
+++ b/src/glsl/apps/.gitignore
@@ -0,0 +1,5 @@
+compile
+process
+purify
+tokenise
+version
diff --git a/src/glsl/cl/sl_cl_parse.c b/src/glsl/cl/sl_cl_parse.c
index 5dddf434e1..e9b3707ac1 100644
--- a/src/glsl/cl/sl_cl_parse.c
+++ b/src/glsl/cl/sl_cl_parse.c
@@ -454,6 +454,8 @@ _fetch_token(struct parse_context *ctx,
case SL_PP_EOF:
ctx->tokens_read++;
break;
+ default:
+ ; /* no-op */
}
}
return &ctx->tokens[pos];