Merge branch 'win-dist'

cchantep · Jun 27, 2014 · 28773e1 · 28773e1
2 parents 50f9b4d + 70de190
commit 28773e1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/dhek.cabal b/dhek.cabal
@@ -94,7 +94,7 @@ executable dhek
                        , dhek
 
   if os(windows)
-    ghc-options: -O2 -threaded -optl-mwindows
+    ghc-options: -O2 -optc-mms-bitfields -optl-mwindows
   if os(darwin)
     ghc-options: -O2 -threaded -optl-ObjC++ -optl-mmacosx-version-min=10.9 -framework AppKit
   if !os(windows) && !os(darwin)

diff --git a/util/win-msys2-dist.sh b/util/win-msys2-dist.sh
@@ -11,6 +11,7 @@ cp dist/build/dhek/dhek.exe "$DISTDIR/bin/"
 cp util/win-dist/dlls/*.dll "$DISTDIR/bin/"
 cp -R util/win-dist/gtk-theme/* "$DISTDIR/"
 cp -R resources "$DISTDIR/bin/resources"
+rm -f "$DISTDIR/bin/resources/*.png"
 
 cat > "$DISTDIR/dhek.bat" << EOF
 start bin\dhek.exe