From 16de6189e7bb6c7ee2cc8d3236d3f8bf666f2e68 Mon Sep 17 00:00:00 2001 From: Andrew Cady Date: Thu, 30 May 2019 06:06:58 -0400 Subject: build with stack --- .gitignore | 3 +++ run.sh | 15 ++++++++++++++- stack.yaml | 28 ++++++++++++++++++++++++++++ 3 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 .gitignore create mode 100644 stack.yaml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..68a56e9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +.stack-work/ +hello_obj2.json +skyboxes/ diff --git a/run.sh b/run.sh index f004906..eb97199 100755 --- a/run.sh +++ b/run.sh @@ -39,4 +39,17 @@ # Mesa may not really implement all the features of the given version. (for # developers only) -MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 ./gix +#cmd=gix +cmd=meshsketch + +quiet() { "$@" >/dev/null 2>&1; } + +quiet which $cmd || quiet stack exec -- which $cmd || stack build + +[ -e .stack-work ] && run='stack run --' || run= + +if [ "$cmd" = meshsketch ]; then + [ -e hello_obj2.json ] || $run lc hello_obj2.lc +fi + +MESA_GL_VERSION_OVERRIDE=3.3 MESA_GLSL_VERSION_OVERRIDE=330 $run $cmd diff --git a/stack.yaml b/stack.yaml new file mode 100644 index 0000000..818677a --- /dev/null +++ b/stack.yaml @@ -0,0 +1,28 @@ +resolver: lts-12.26 +packages: +- . + +# - lambdacube-compiler +# - lambdacube-gl +# - lambdacube-ir/ddl +# - lambdacube-ir/lambdacube-ir.haskell + +- location: + git: d@emmy.childrenofmay.org:public_git/lambdacube-compiler + commit: fbb307078eb95cada21ba8dc2475c67220c4f636 + extra-dep: true +- location: + git: d@emmy.childrenofmay.org:public_git/lambdacube-gl + commit: b13702e457d79f79831f8e852edd89a6abf28d81 + extra-dep: true +- location: + git: d@emmy.childrenofmay.org:public_git/lambdacube-ir + commit: f6617496f582ad287bd8203d931a6ee037ed3a69 + subdirs: + - lambdacube-ir.haskell + - ddl + extra-dep: true +extra-deps: +- ede-0.2.9 +- text-format-0.3.2 +- wavefront-0.7.1.3 -- cgit v1.2.3