summaryrefslogtreecommitdiff
path: root/Build/source/utils/asymptote/build-scripts
diff options
context:
space:
mode:
Diffstat (limited to 'Build/source/utils/asymptote/build-scripts')
-rwxr-xr-xBuild/source/utils/asymptote/build-scripts/build-asygl4
-rwxr-xr-xBuild/source/utils/asymptote/build-scripts/build-asymptote9
-rwxr-xr-xBuild/source/utils/asymptote/build-scripts/build-asymptote.dos2
3 files changed, 12 insertions, 3 deletions
diff --git a/Build/source/utils/asymptote/build-scripts/build-asygl b/Build/source/utils/asymptote/build-scripts/build-asygl
index d28bb85fa91..46e0cfd082b 100755
--- a/Build/source/utils/asymptote/build-scripts/build-asygl
+++ b/Build/source/utils/asymptote/build-scripts/build-asygl
@@ -1,5 +1,5 @@
#!/bin/sh
-if [ ! $# = 1 ]; then echo Usage: "$0 AsyGLVersion"; exit 1; fi
+if [ ! $# = 0 ]; then echo Usage: "$0"; exit 1; fi
GL_MATRIX_VERSION=2.4.0
GL_MATRIX_DIR=gl-matrix-$GL_MATRIX_VERSION
GL_MATRIX_DIR_PRUNED=$GL_MATRIX_DIR-pruned
@@ -18,4 +18,4 @@ echo "/*@license for gl-matrix mat3 and mat4 functions:" > LICENSE.js
echo "*/"| cat LICENSE.md - >> LICENSE.js
cd ..
fi
-cat $GL_MATRIX_DIR_PRUNED/dist/gl-matrix-min.js webgl/gl.js $GL_MATRIX_DIR_PRUNED/LICENSE.js | uglifyjs -m -c -o base/webgl/asygl-$1.js --comments
+cat $GL_MATRIX_DIR_PRUNED/dist/gl-matrix.js webgl/gl.js $GL_MATRIX_DIR_PRUNED/LICENSE.js | uglifyjs -m -c -o base/webgl/asygl.js --comments
diff --git a/Build/source/utils/asymptote/build-scripts/build-asymptote b/Build/source/utils/asymptote/build-scripts/build-asymptote
index fdbb28ee69e..9bbc66b36c3 100755
--- a/Build/source/utils/asymptote/build-scripts/build-asymptote
+++ b/Build/source/utils/asymptote/build-scripts/build-asymptote
@@ -42,7 +42,16 @@ rm -rf .gitignore .vscode
./configure
make $MAKEFLAGS check || exit
make uninstall
+build-scripts/build-asygl
+GLMATRIX=`/bin/ls -d gl-matrix-*-pruned`
+mkdir temp
+mv $GLMATRIX temp
+mkdir -p $GLMATRIX/dist
+cp temp/$GLMATRIX/LICENSE.js $GLMATRIX/
+cp temp/$GLMATRIX/dist/gl-matrix.js $GLMATRIX/dist/
+rm -rf temp
make $MAKEFLAGS asy
+rm base/webgl/asygl-*.js
make -j1 all
make -j1 install
#rm asy
diff --git a/Build/source/utils/asymptote/build-scripts/build-asymptote.dos b/Build/source/utils/asymptote/build-scripts/build-asymptote.dos
index 943c7ca0a1b..b8755c7591c 100755
--- a/Build/source/utils/asymptote/build-scripts/build-asymptote.dos
+++ b/Build/source/utils/asymptote/build-scripts/build-asymptote.dos
@@ -31,7 +31,7 @@ fi
BUILD=build-$VERSION
ln -sf ../gc-$GC.tar.gz .
ln -sf ../gc-$GC .
-make -n MSDOS=1 >& /dev/null || ./configure --enable-gc=$GC --with-latex=/usr/local/share --with-context=/usr/local/share
+make -n MSDOS=1 >& /dev/null || ./configure OSTYPE=msdos --enable-gc=$GC --with-latex=/usr/local/share --with-context=/usr/local/share
rm -rf $BUILD
mkdir -p $BUILD
cp -a $HOME/dll/cygwin/*.dll $BUILD