[Scummvm-cvs-logs] scummvm master -> ff60ee30ada8657d61ba93f3cfa85323c22e6a64

[Kirben]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
ff60ee30ad WIN32: Update build target and installer for SDL2.


Commit: ff60ee30ada8657d61ba93f3cfa85323c22e6a64
    https://github.com/scummvm/scummvm/commit/ff60ee30ada8657d61ba93f3cfa85323c22e6a64
Author: Kirben (kirben at optusnet.com.au)
Date: 2016-08-20T16:45:50+10:00

Commit Message:
WIN32: Update build target and installer for SDL2.

Changed paths:
    dists/win32/ScummVM.iss
    ports.mk



diff --git a/dists/win32/ScummVM.iss b/dists/win32/ScummVM.iss
index 740b30d..6a5b7d9 100644
--- a/dists/win32/ScummVM.iss
+++ b/dists/win32/ScummVM.iss
@@ -105,7 +105,7 @@ Source: doc/de/LIESMICH.txt; DestDir: {app}; Flags: ignoreversion isreadme; Lang
 Source: doc/se/LasMig.txt; DestDir: {app}; Flags: ignoreversion isreadme; Languages: se
 Source: README-SDL.txt; DestDir: {app}; Flags: ignoreversion
 Source: scummvm.exe; DestDir: {app}; Flags: ignoreversion
-Source: SDL.dll; DestDir: {app}; Flags: replacesameversion
+Source: SDL2.dll; DestDir: {app}; Flags: replacesameversion
 ;Mirgration script for saved games in Windows NT4 onwards
 Source: migration.bat; DestDir: {app}; Flags: ignoreversion; MinVersion: 0, 1
 Source: migration.txt; DestDir: {app}; Flags: ignoreversion; MinVersion: 0, 1
diff --git a/ports.mk b/ports.mk
index 91bde72..286c488 100644
--- a/ports.mk
+++ b/ports.mk
@@ -461,7 +461,7 @@ win32dist: $(EXECUTABLE)
 	cp $(srcdir)/doc/de/LIESMICH $(WIN32PATH)/doc/de/LIESMICH.txt
 	cp $(srcdir)/doc/se/LasMig $(WIN32PATH)/doc/se/LasMig.txt
 	cp /usr/local/README-SDL.txt $(WIN32PATH)
-	cp /usr/local/bin/SDL.dll $(WIN32PATH)
+	cp /usr/local/bin/SDL2.dll $(WIN32PATH)
 	cp $(srcdir)/dists/win32/graphics/left.bmp $(WIN32PATH)/graphics
 	cp $(srcdir)/dists/win32/graphics/scummvm-install.ico $(WIN32PATH)/graphics
 	cp $(srcdir)/dists/win32/migration.bat $(WIN32PATH)