diff options
author | Zero~Informatique | 2020-02-13 18:17:35 +0100 |
---|---|---|
committer | Zero~Informatique | 2020-02-13 18:17:35 +0100 |
commit | 6c51a97bce7963fba47892602c1214b3bcdcd410 (patch) | |
tree | 0df87fda5a480718cf35b6087555039a706df524 /scripts | |
parent | 9c2af5dcd2d2c8754e4c74e02141822c0964a5a8 (diff) | |
parent | ef1778e051e007f08f9188a479d04fdf95a57d21 (diff) | |
download | ldgallery-6c51a97bce7963fba47892602c1214b3bcdcd410.tar.gz |
Merge branch 'oz-config-json' into develop
# Conflicts:
# scripts/win_compile_example.cmd
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/win_compile_example.cmd | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/win_compile_example.cmd b/scripts/win_compile_example.cmd index e89b302..1226269 100644 --- a/scripts/win_compile_example.cmd +++ b/scripts/win_compile_example.cmd | |||
@@ -3,8 +3,8 @@ SET rebuild=--rebuild | |||
3 | CHOICE /M "Rebuild all ('--rebuild' argument)?" | 3 | CHOICE /M "Rebuild all ('--rebuild' argument)?" |
4 | IF ERRORLEVEL 2 SET rebuild= | 4 | IF ERRORLEVEL 2 SET rebuild= |
5 | echo. | 5 | echo. |
6 | cd ..\compiler\ | ||
6 | 7 | ||
7 | @echo on | 8 | @echo on |
8 | cd ..\compiler\ | 9 | stack exec ldgallery-compiler-exe -- %rebuild% --clean-output -i=../example/src/ -o=../example/out/ |
9 | stack exec ldgallery-compiler-exe -- %rebuild% --clean-output -i=../example/ -o=../example/out/ | ||
10 | @pause | 10 | @pause |