aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPierre Renaux <pierre@talansoft.com>2013-11-06 18:47:26 +0800
committerPierre Renaux <pierre@talansoft.com>2013-11-06 18:47:26 +0800
commit1e4e155f25751f87b7b246448f98644c5f5c535c (patch)
tree1465ac79c5e3df50a114959f96ffe9c12ca296d5
parentc4b07c9d429603e492657992f77ad982577d72d9 (diff)
[thirdparty/lzma.js]: Fixed doit.sh so that it compiles on Windows using MingW's GCC & Bash ;
-rw-r--r--.gitignore3
-rwxr-xr-xthird_party/lzma.js/doit.sh11
2 files changed, 11 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 747394e7..f5f3313c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,7 +6,7 @@ src/relooper*.js
node_modules/
-# Ignore generated files
+# Ignore generated files
src/relooper.js
src/relooper.js.raw.js
src/relooper/*.o
@@ -18,3 +18,4 @@ tests/freetype/objs/*.lo
third_party/lzma.js/lzip/*.o
third_party/lzma.js/lzma-native
+third_party/lzma.js/lzma-native.exe
diff --git a/third_party/lzma.js/doit.sh b/third_party/lzma.js/doit.sh
index 1f530651..6046022c 100755
--- a/third_party/lzma.js/doit.sh
+++ b/third_party/lzma.js/doit.sh
@@ -5,7 +5,14 @@ export CXX=`../../../em-config LLVM_ROOT`/clang++
echo "native"
make clean
DECODER_ONLY=0 make lzip -j 4 # native build
-mv lzip ../lzma-native
+case `uname` in
+ *_NT*)
+ mv lzip.exe ../lzma-native.exe
+ ;;
+ *)
+ mv lzip ../lzma-native
+ ;;
+esac
exit # just build natively, that's it
@@ -18,7 +25,7 @@ echo "bitcode decoder only"
make clean
DECODER_ONLY=1 ../../../emmake make lzip -j 4
mv lzip lzip-decoder.bc
-
+
cd ..
echo "javascript full"