Merge branch 'master' into v2.91i

AliceLR · Dec 9, 2018 · e6b9a04 · e6b9a04
2 parents e3ddb2d + 0781bd6
commit e6b9a04
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/debian/changelog b/debian/changelog
@@ -1,3 +1,9 @@
+megazeux (2.91i) unstable; urgency=low
+
+  * Updated for 2.91i.
+
+ -- Dylan J Morrison <dylanjmorrison611@gmail.com>  Sat, 09 Dec 2018 00:56:00 -0500
+
 megazeux (2.91h) unstable; urgency=low
 
   * Updated for 2.91h.

diff --git a/scripts/msys2-buildscripts/mingw-init-environment.sh b/scripts/msys2-buildscripts/mingw-init-environment.sh
@@ -3,7 +3,7 @@ MSYSTEM=MSYS
 
 echo "Y" | pacman -Syu
 pacman --needed --noconfirm -S git make tar curl zip mingw-w64-{x86_64,i686}-{zlib,gcc,libpng,libogg,libvorbis,SDL2}
-rm -rf /mingw{32,64}/lib/lib{ogg,png16,vorbis,vorbisfile,z}.dll.a /mingw64/x86_64-w64-mingw32/lib/lib{pthread,winpthread}.dll.a /mingw32/i686-w64-mingw32/lib/lib{pthread,winpthread}.dll.a
+rm -rf /mingw{32,64}/lib/lib{ogg,png,png16,vorbis,vorbisfile,z}.dll.a /mingw64/x86_64-w64-mingw32/lib/lib{pthread,winpthread}.dll.a /mingw32/i686-w64-mingw32/lib/lib{pthread,winpthread}.dll.a
 mkdir -p /mzx-build-workingdir
 cd /mzx-build-workingdir
 git clone $1