diff options
| author | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 15:39:29 -0800 |
|---|---|---|
| committer | Alon Zakai <alonzakai@gmail.com> | 2013-11-08 15:39:29 -0800 |
| commit | 128ea802e3ec1268b6a934373f2b45d37c6f501f (patch) | |
| tree | fab7db982423bb2586324fa1c9153ceee0f57432 /third_party/lzma.js | |
| parent | a25e9721173dc072c5ab82b7084a6ebe3d24dec9 (diff) | |
| parent | 1e4e155f25751f87b7b246448f98644c5f5c535c (diff) | |
Merge pull request #1761 from prenaux/develop
GLUT support for DELETE & BACKSPACE keys ; Fixed lzma.js doit.sh so that it works on Windows ; Removed unnecessary warning in em++ ;
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" |