diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:01:27 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 16:04:05 -0800 |
| commit | b873dc778f52461129b1e28fb12dd3d4a309851c (patch) | |
| tree | e82913bc549a83104ce8abfb518eca6cb6d8aa83 /third_party/lzma.js | |
| parent | 140ea9e81feb09d8f2559995c73d49a39424ef5d (diff) | |
| parent | e0268fa1035a718341c53921eee9318d4a8033cd (diff) | |
Merge branch 'incoming' into f32
Conflicts:
src/parseTools.js
src/preamble.js
Diffstat (limited to 'third_party/lzma.js')
| -rwxr-xr-x | third_party/lzma.js/doit.sh | 11 |
1 files changed, 9 insertions, 2 deletions
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" |