Merge pull request #2087 from hawkthorne/master

new minor
hawkthorne · Apr 27, 2014 · 981901b · 981901b
2 parents 9ab7c9e + 7f0ebda
commit 981901b
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -77,12 +77,12 @@ src/positions/%.lua: psds/positions/%.png
 
 win32/love.exe:
  $(wget) https://bitbucket.org/rude/love/downloads/love-0.9.1-win32.zip
- mkdir win32
- unzip -d win32 love-0.9.1-win32.zip
+ unzip love-0.9.1-win32.zip
+ mv love-0.9.1-win32 win32
  rm -f love-0.9.1-win32.zip
 
 win32/hawkthorne.exe: build/hawkthorne.love win32/love.exe
- cat win32/love-0.9.1-win32/love.exe build/hawkthorne.love > win32/hawkthorne.exe
+ cat win32/love.exe build/hawkthorne.love > win32/hawkthorne.exe
 
 build/hawkthorne-win-x86.zip: win32/hawkthorne.exe
  mkdir -p build

diff --git a/scripts/upload_binaries.py b/scripts/upload_binaries.py
@@ -14,8 +14,13 @@
 
 files = [
  "DevIL.dll",
- "SDL.dll",
+ "love.dll",
+ "lua51.dll",
+ "mpg123.dll",
+ "msvcp110.dll",
+ "mxvcr110.dll",
  "OpenAL32.dll",
+ "SDL2.dll",
  "hawkthorne.exe",
 ]