add options for encoder choice

2 files changed, 2 insertions, 0 deletions

diff --git a/Makefile b/Makefile
index 6a8c1d5..aec43ed 100644
--- a/Makefile
+++ b/Makefile
@@ -7,6 +7,7 @@ default: gen_mipmaps.c fix_mali_ktx.c gen_ktx.c
 	gcc -g gen_mipmaps_man.c -o gen_mipmaps_man -L ~/repos/mesa/lib -lGL -lwaffle-1 -lktx
 	gcc -g fix_mali_ktx.c -o fix_mali_ktx -lktx -L ~/repos/mesa/lib -lGL
 	gcc -g gen_ktx.c -o gen_ktx -lktx
+	make -C astc-encoder/Source
 
 ktxes:
 	./make_ktxes.sh waffles.jpg
diff --git a/make_ktxes.sh b/make_ktxes.sh
index e62f651..4bcef10 100755
--- a/make_ktxes.sh
+++ b/make_ktxes.sh
@@ -110,6 +110,7 @@ Blk=(
 )
 
 # Executables
+encoder=./astc-encoder/Binary/Linux32/astcenc
 encoder=./astc-encoder/Source/astcenc
 ktx_fix=./fix_mali_ktx
 ktx_gen=./gen_ktx