From a5398bd663064d3ebca61c3e49eeb7773eadd612 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Wed, 29 Jun 2011 15:22:43 -0400
Subject: LASTEXPRESS: Fix loading of subtitles from sound name

---
 engines/lastexpress/sound/entry.cpp | 10 +++++-----
 engines/lastexpress/sound/sound.cpp |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/engines/lastexpress/sound/entry.cpp b/engines/lastexpress/sound/entry.cpp
index 4bdb9f7f96..2840d85ca7 100644
--- a/engines/lastexpress/sound/entry.cpp
+++ b/engines/lastexpress/sound/entry.cpp
@@ -752,7 +752,7 @@ void SubtitleEntry::load(Common::String filename, SoundEntry *soundEntry) {
 	_sound = soundEntry;
 
 	// Load subtitle data
-	if (_engine->getResourceManager()->hasFile(filename)) {
+	if (_engine->getResourceManager()->hasFile(_filename)) {
 		if (getSoundQueue()->getSubtitleFlag() & 2)
 			return;
 
@@ -786,6 +786,8 @@ void SubtitleEntry::setupAndDraw() {
 	}
 
 	getSoundQueue()->setCurrentSubtitle(this);
+
+	// TODO Missing code
 }
 
 void SubtitleEntry::draw() {
@@ -801,13 +803,11 @@ void SubtitleEntry::draw() {
 }
 
 void SubtitleEntry::drawOnScreen() {
-	getSoundQueue()->setSubtitleFlag(getSoundQueue()->getSubtitleFlag() & -1);
-
 	if (_data == NULL)
 		return;
 
-	if (getSoundQueue()->getSubtitleFlag() & 1)
-		_engine->getGraphicsManager()->draw(_data, GraphicsManager::kBackgroundOverlay);
+	getSoundQueue()->setSubtitleFlag(getSoundQueue()->getSubtitleFlag() & -2);
+	_engine->getGraphicsManager()->draw(_data, GraphicsManager::kBackgroundOverlay);
 }
 
 } // End of namespace LastExpress
diff --git a/engines/lastexpress/sound/sound.cpp b/engines/lastexpress/sound/sound.cpp
index ff9e7e5aac..c04b6d361f 100644
--- a/engines/lastexpress/sound/sound.cpp
+++ b/engines/lastexpress/sound/sound.cpp
@@ -162,7 +162,8 @@ bool SoundManager::playSoundWithSubtitles(Common::String filename, SoundFlag fla
 		entry->setStatus(entry->getStatus().status | kSoundStatus_8000);
 	} else {
 		// Get subtitles name
-		while (filename.size() > 4)
+		uint32 size = filename.size();
+		while (filename.size() > size - 4)
 			filename.deleteLastChar();
 
 		entry->showSubtitle(filename);
-- 
cgit v1.2.3


From 02b03bc6c10be7b1591468106007f4624f8525bd Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Thu, 30 Jun 2011 22:41:52 -0400
Subject: CONFIGURE: Rename $WIN32BUILD to $STAGING

---
 .gitignore |  1 +
 configure  |  4 ++--
 ports.mk   | 28 ++++++++++++----------------
 3 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4ad9f07b34..99902064ea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,6 +28,7 @@ lib*.a
 /Icon.*
 
 /build
+/staging
 
 /backends/platform/dc/gui
 /backends/platform/dc/graphics
diff --git a/configure b/configure
index 932ab9a31c..78998f8100 100755
--- a/configure
+++ b/configure
@@ -174,7 +174,7 @@ _strip=strip
 _ar="ar cru"
 _as="as"
 _windres=windres
-_win32build="build/x86"
+_stagingpath="staging"
 _win32path="c:/scummvm"
 _aos4path="Games:ScummVM"
 _staticlibpath=/sw
@@ -3519,7 +3519,7 @@ AS := $_as
 ASFLAGS := $ASFLAGS
 WINDRES := $_windres
 WINDRESFLAGS := $WINDRESFLAGS
-WIN32BUILD=$_win32build
+STAGINGPATH=$_stagingpath
 WIN32PATH=$_win32path
 AOS4PATH=$_aos4path
 STATICLIBPATH=$_staticlibpath
diff --git a/ports.mk b/ports.mk
index 495037aaf1..80d2cd7f02 100644
--- a/ports.mk
+++ b/ports.mk
@@ -186,22 +186,18 @@ endif
 
 # Special target to create a win32 NSIS installer
 win32setup: $(EXECUTABLE)
-	mkdir -p $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/AUTHORS          $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/COPYING          $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/COPYING.LGPL     $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/COPYRIGHT        $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/NEWS             $(srcdir)/$(WIN32BUILD)
-	cp $(srcdir)/README           $(srcdir)/$(WIN32BUILD)
-	cp /usr/local/README-SDL.txt  $(srcdir)/$(WIN32BUILD)/README-SDL
-	unix2dos $(srcdir)/$(WIN32BUILD)/*.*
-	$(STRIP) $(EXECUTABLE) -o $(srcdir)/$(WIN32BUILD)/$(EXECUTABLE)
-	cp $(DIST_FILES_THEMES) $(srcdir)/$(WIN32BUILD)
-ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) $(srcdir)/$(WIN32BUILD)
-endif
-	cp /usr/local/bin/SDL.dll $(srcdir)/$(WIN32BUILD)
-	makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32BUILD)" -Dbuild_dir="../../$(WIN32BUILD)" $(srcdir)/dists/win32/scummvm.nsi
+	mkdir -p $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/AUTHORS          $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/COPYING          $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/COPYING.LGPL     $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/COPYRIGHT        $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/NEWS             $(srcdir)/$(STAGINGPATH)
+	cp $(srcdir)/README           $(srcdir)/$(STAGINGPATH)
+	cp /usr/local/README-SDL.txt  $(srcdir)/$(STAGINGPATH)/README-SDL
+	unix2dos $(srcdir)/$(STAGINGPATH)/*.*
+	$(STRIP) $(EXECUTABLE) -o $(srcdir)/$(STAGINGPATH)/$(EXECUTABLE)
+	cp /usr/local/bin/SDL.dll $(srcdir)/$(STAGINGPATH)
+	makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(STAGINGPATH)" -Dbuild_dir="../../$(STAGINGPATH)" $(srcdir)/dists/win32/scummvm.nsi
 
 #
 # AmigaOS specific
-- 
cgit v1.2.3


From ac165d6f19c1d701a545e5879f252957d2c48130 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Thu, 30 Jun 2011 22:42:51 -0400
Subject: DISTS: Add missing IDI_COUNT to scummvm.rc.in

---
 dists/scummvm.rc.in | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/dists/scummvm.rc.in b/dists/scummvm.rc.in
index 8186e0e8ef..2fd3946cc5 100644
--- a/dists/scummvm.rc.in
+++ b/dists/scummvm.rc.in
@@ -5,9 +5,11 @@
 #endif
 
 #define FILE 256
-#define IDI_ICON 1001
+#define IDI_ICON  1001
+#define IDI_COUNT 1002
 
 IDI_ICON               ICON    DISCARDABLE     "icons/scummvm.ico"
+IDI_COUNT              ICON    DISCARDABLE     "icons/count.ico"
 
 scummmodern.zip        FILE    "gui/themes/scummmodern.zip"
 #ifdef USE_TRANSLATION
-- 
cgit v1.2.3


From db1ec4a42daf2d267b703598f7080d6c60712bd7 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Thu, 30 Jun 2011 22:47:28 -0400
Subject: TOOLS: Update NSIS script location

---
 devtools/update-version.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/devtools/update-version.pl b/devtools/update-version.pl
index 788cbc7e40..169fba7788 100755
--- a/devtools/update-version.pl
+++ b/devtools/update-version.pl
@@ -39,7 +39,7 @@ my @subs_files = qw(
 	dists/macosx/Info.plist
 	dists/iphone/Info.plist
 	dists/irix/scummvm.spec
-	dists/nsis/scummvm.nsi
+	dists/win32/scummvm.nsi
 	dists/wii/meta.xml
 	dists/android/AndroidManifest.xml
 	dists/android/plugin-manifest.xml
-- 
cgit v1.2.3


From 1f1367bb5adb4239779064245eb8acb2d3c2ca95 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Thu, 30 Jun 2011 23:30:05 -0400
Subject: NSIS: Convert line endings on the fly during installation

---
 dists/win32/scummvm.nsi | 104 +++++++++++++++++++++++++++++++++++++++---------
 ports.mk                |  10 +----
 2 files changed, 86 insertions(+), 28 deletions(-)

diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi
index 50ccadaf74..c5b6100b88 100644
--- a/dists/win32/scummvm.nsi
+++ b/dists/win32/scummvm.nsi
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-#!define _DEBUG
+!define _DEBUG
 #!define _INCLUDE_DATA_FILES
 
 Name ScummVM
@@ -31,8 +31,7 @@ Name ScummVM
 #########################################################################################
 
 #!define top_srcdir   ""
-#!define build_dir    ""
-#!define text_dir     ""
+#!define staging_dir    ""
 #!define ARCH         ""    ;(optional, defaults to win32)
 
 # Check parameters
@@ -40,12 +39,8 @@ Name ScummVM
 	!error "Top source folder has not been passed to command line!"
 !endif
 
-!ifndef build_dir
-	!error "Build folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
-!endif
-
-!ifndef text_dir
-	!error "Text folder has not been passed to command line (this folder should contain all the text files used by the installer)!"
+!ifndef staging_dir
+	!error "Staging folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
 !endif
 
 !ifndef ARCH
@@ -72,7 +67,7 @@ Name ScummVM
 #########################################################################################
 # Installer configuration
 #########################################################################################
-OutFile          ${build_dir}\scummvm-${VERSION}-${ARCH}.exe
+OutFile          ${staging_dir}\scummvm-${VERSION}-${ARCH}.exe
 InstallDir       $PROGRAMFILES\ScummVM                            ; Default installation folder
 InstallDirRegKey HKCU "Software\ScummVM\ScummVM" "InstallPath"    ; Get installation folder from registry if available
                                                                   ; The application name needs to be refered directly instead of through ${REGKEY}
@@ -224,13 +219,26 @@ Section "ScummVM" SecMain
 	SetOverwrite on
 
 	# Text files
-	File /oname=AUTHORS.txt      "${text_dir}\AUTHORS"
-	File /oname=COPYING.LGPL.txt "${text_dir}\COPYING.LGPL"
-	File /oname=COPYING.txt      "${text_dir}\COPYING"
-	File /oname=COPYRIGHT.txt    "${text_dir}\COPYRIGHT"
-	File /oname=NEWS.txt         "${text_dir}\NEWS"
-	File /oname=README.txt       "${text_dir}\README"
-	File /oname=README-SDL.txt   "${build_dir}\README-SDL"
+	File /oname=AUTHORS.txt      "${top_srcdir}\AUTHORS"	
+	File /oname=COPYING.LGPL.txt "${top_srcdir}\COPYING.LGPL"
+	File /oname=COPYING.txt      "${top_srcdir}\COPYING"
+	File /oname=COPYRIGHT.txt    "${top_srcdir}\COPYRIGHT"
+	File /oname=NEWS.txt         "${top_srcdir}\NEWS"
+	File /oname=README.txt       "${top_srcdir}\README"
+	
+	# Convert line endings
+	Push "$INSTDIR\AUTHORS.txt"
+	Call unix2dos	
+	Push "$INSTDIR\COPYING.LGPL.txt"
+	Call unix2dos	
+	Push "$INSTDIR\COPYING.txt"
+	Call unix2dos	
+	Push "$INSTDIR\COPYRIGHT.txt"
+	Call unix2dos	
+	Push "$INSTDIR\NEWS.txt"
+	Call unix2dos	
+	Push "$INSTDIR\README.txt"
+	Call unix2dos
 
 !ifdef _INCLUDE_DATA_FILES
 	# Engine data
@@ -253,8 +261,8 @@ Section "ScummVM" SecMain
 !endif
 
 	# Main exe and dlls
-	File "${build_dir}\scummvm.exe"
-	File "${build_dir}\SDL.dll"
+	File "${staging_dir}\scummvm.exe"
+	File "${staging_dir}\SDL.dll"
 
 	WriteRegStr HKCU "${REGKEY}" InstallPath "$INSTDIR"    ; Store installation folder
 SectionEnd
@@ -354,3 +362,61 @@ Function un.onInit
 	ReadRegStr   $INSTDIR HKCU "${REGKEY}" InstallPath
 	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
 FunctionEnd
+
+
+#########################################################################################
+# Helper functions
+#########################################################################################
+
+;-------------------------------------------------------------------------------
+; strips all CRs and then converts all LFs into CRLFs
+; (this is roughly equivalent to "cat file | dos2unix | unix2dos")
+;
+; Usage:
+;	Push "infile"
+;	Call unix2dos
+;
+; Note: this function destroys $0 $1 $2
+Function unix2dos
+	ClearErrors
+
+	Pop $2
+	Rename $2 $2.U2D
+	FileOpen $1 $2 w
+
+	FileOpen $0 $2.U2D r
+
+	Push $2 ; save name for deleting
+
+	IfErrors unix2dos_done
+
+	; $0 = file input (opened for reading)
+	; $1 = file output (opened for writing)
+
+unix2dos_loop:
+	; read a byte (stored in $2)
+	FileReadByte $0 $2
+	IfErrors unix2dos_done ; EOL
+	; skip CR
+	StrCmp $2 13 unix2dos_loop
+	; if LF write an extra CR
+	StrCmp $2 10 unix2dos_cr unix2dos_write
+
+unix2dos_cr:
+	FileWriteByte $1 13
+
+unix2dos_write:
+	; write byte
+	FileWriteByte $1 $2
+	; read next byte
+	Goto unix2dos_loop
+
+unix2dos_done:
+	; close files
+	FileClose $0
+	FileClose $1
+
+	; delete original
+	Pop $0
+	Delete $0.U2D
+FunctionEnd
diff --git a/ports.mk b/ports.mk
index 80d2cd7f02..8e7ac2376b 100644
--- a/ports.mk
+++ b/ports.mk
@@ -187,17 +187,9 @@ endif
 # Special target to create a win32 NSIS installer
 win32setup: $(EXECUTABLE)
 	mkdir -p $(srcdir)/$(STAGINGPATH)
-	cp $(srcdir)/AUTHORS          $(srcdir)/$(STAGINGPATH)
-	cp $(srcdir)/COPYING          $(srcdir)/$(STAGINGPATH)
-	cp $(srcdir)/COPYING.LGPL     $(srcdir)/$(STAGINGPATH)
-	cp $(srcdir)/COPYRIGHT        $(srcdir)/$(STAGINGPATH)
-	cp $(srcdir)/NEWS             $(srcdir)/$(STAGINGPATH)
-	cp $(srcdir)/README           $(srcdir)/$(STAGINGPATH)
-	cp /usr/local/README-SDL.txt  $(srcdir)/$(STAGINGPATH)/README-SDL
-	unix2dos $(srcdir)/$(STAGINGPATH)/*.*
 	$(STRIP) $(EXECUTABLE) -o $(srcdir)/$(STAGINGPATH)/$(EXECUTABLE)
 	cp /usr/local/bin/SDL.dll $(srcdir)/$(STAGINGPATH)
-	makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(STAGINGPATH)" -Dbuild_dir="../../$(STAGINGPATH)" $(srcdir)/dists/win32/scummvm.nsi
+	makensis -V2 -Dtop_srcdir="../.." -Dstaging_dir="../../$(STAGINGPATH)" $(srcdir)/dists/win32/scummvm.nsi
 
 #
 # AmigaOS specific
-- 
cgit v1.2.3


From f38a31e208cc50bfbe1e49122f66b7534a05e836 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Fri, 1 Jul 2011 00:24:31 -0400
Subject: NSIS: Always pass ARCH variable to script and handle case when the
 variable is empty

---
 dists/win32/scummvm.nsi    |  22 +++++----
 dists/win32/scummvm.nsi.in | 108 +++++++++++++++++++++++++++++++++++++--------
 ports.mk                   |   2 +-
 3 files changed, 105 insertions(+), 27 deletions(-)

diff --git a/dists/win32/scummvm.nsi b/dists/win32/scummvm.nsi
index c5b6100b88..480f8f47ee 100644
--- a/dists/win32/scummvm.nsi
+++ b/dists/win32/scummvm.nsi
@@ -18,7 +18,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 
-!define _DEBUG
+#!define _DEBUG
 #!define _INCLUDE_DATA_FILES
 
 Name ScummVM
@@ -31,7 +31,7 @@ Name ScummVM
 #########################################################################################
 
 #!define top_srcdir   ""
-#!define staging_dir    ""
+#!define staging_dir  ""
 #!define ARCH         ""    ;(optional, defaults to win32)
 
 # Check parameters
@@ -46,6 +46,12 @@ Name ScummVM
 !ifndef ARCH
 	!warning "ARCH has not been defined, defaulting to 'win32'"
 	!define ARCH         "win32"
+!else
+	!if "${ARCH}" == ""
+		!warning "ARCH was empty, defaulting to 'win32'"
+		!undef ARCH
+		!define ARCH         "win32"
+	!endif
 !endif
 
 #########################################################################################
@@ -219,7 +225,7 @@ Section "ScummVM" SecMain
 	SetOverwrite on
 
 	# Text files
-	File /oname=AUTHORS.txt      "${top_srcdir}\AUTHORS"	
+	File /oname=AUTHORS.txt      "${top_srcdir}\AUTHORS"
 	File /oname=COPYING.LGPL.txt "${top_srcdir}\COPYING.LGPL"
 	File /oname=COPYING.txt      "${top_srcdir}\COPYING"
 	File /oname=COPYRIGHT.txt    "${top_srcdir}\COPYRIGHT"
@@ -228,15 +234,15 @@ Section "ScummVM" SecMain
 	
 	# Convert line endings
 	Push "$INSTDIR\AUTHORS.txt"
-	Call unix2dos	
+	Call unix2dos
 	Push "$INSTDIR\COPYING.LGPL.txt"
-	Call unix2dos	
+	Call unix2dos
 	Push "$INSTDIR\COPYING.txt"
-	Call unix2dos	
+	Call unix2dos
 	Push "$INSTDIR\COPYRIGHT.txt"
-	Call unix2dos	
+	Call unix2dos
 	Push "$INSTDIR\NEWS.txt"
-	Call unix2dos	
+	Call unix2dos
 	Push "$INSTDIR\README.txt"
 	Call unix2dos
 
diff --git a/dists/win32/scummvm.nsi.in b/dists/win32/scummvm.nsi.in
index c94e5943f7..a87f5d6244 100644
--- a/dists/win32/scummvm.nsi.in
+++ b/dists/win32/scummvm.nsi.in
@@ -31,8 +31,7 @@ Name ScummVM
 #########################################################################################
 
 #!define top_srcdir   ""
-#!define build_dir    ""
-#!define text_dir     ""
+#!define staging_dir  ""
 #!define ARCH         ""    ;(optional, defaults to win32)
 
 # Check parameters
@@ -40,17 +39,19 @@ Name ScummVM
 	!error "Top source folder has not been passed to command line!"
 !endif
 
-!ifndef build_dir
-	!error "Build folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
-!endif
-
-!ifndef text_dir
-	!error "Text folder has not been passed to command line (this folder should contain all the text files used by the installer)!"
+!ifndef staging_dir
+	!error "Staging folder has not been passed to command line (this folder should contain the executable and linked DLLs)!"
 !endif
 
 !ifndef ARCH
 	!warning "ARCH has not been defined, defaulting to 'win32'"
 	!define ARCH         "win32"
+!else
+	!if "${ARCH}" == ""
+		!warning "ARCH was empty, defaulting to 'win32'"
+		!undef ARCH
+		!define ARCH         "win32"
+	!endif
 !endif
 
 #########################################################################################
@@ -72,7 +73,7 @@ Name ScummVM
 #########################################################################################
 # Installer configuration
 #########################################################################################
-OutFile          ${build_dir}\scummvm-${VERSION}-${ARCH}.exe
+OutFile          ${staging_dir}\scummvm-${VERSION}-${ARCH}.exe
 InstallDir       $PROGRAMFILES\ScummVM                            ; Default installation folder
 InstallDirRegKey HKCU "Software\ScummVM\ScummVM" "InstallPath"    ; Get installation folder from registry if available
                                                                   ; The application name needs to be refered directly instead of through ${REGKEY}
@@ -224,13 +225,26 @@ Section "ScummVM" SecMain
 	SetOverwrite on
 
 	# Text files
-	File /oname=AUTHORS.txt      "${text_dir}\AUTHORS"
-	File /oname=COPYING.LGPL.txt "${text_dir}\COPYING.LGPL"
-	File /oname=COPYING.txt      "${text_dir}\COPYING"
-	File /oname=COPYRIGHT.txt    "${text_dir}\COPYRIGHT"
-	File /oname=NEWS.txt         "${text_dir}\NEWS"
-	File /oname=README.txt       "${text_dir}\README"
-	File /oname=README-SDL.txt   "${build_dir}\README-SDL"
+	File /oname=AUTHORS.txt      "${top_srcdir}\AUTHORS"
+	File /oname=COPYING.LGPL.txt "${top_srcdir}\COPYING.LGPL"
+	File /oname=COPYING.txt      "${top_srcdir}\COPYING"
+	File /oname=COPYRIGHT.txt    "${top_srcdir}\COPYRIGHT"
+	File /oname=NEWS.txt         "${top_srcdir}\NEWS"
+	File /oname=README.txt       "${top_srcdir}\README"
+	
+	# Convert line endings
+	Push "$INSTDIR\AUTHORS.txt"
+	Call unix2dos
+	Push "$INSTDIR\COPYING.LGPL.txt"
+	Call unix2dos
+	Push "$INSTDIR\COPYING.txt"
+	Call unix2dos
+	Push "$INSTDIR\COPYRIGHT.txt"
+	Call unix2dos
+	Push "$INSTDIR\NEWS.txt"
+	Call unix2dos
+	Push "$INSTDIR\README.txt"
+	Call unix2dos
 
 !ifdef _INCLUDE_DATA_FILES
 	# Engine data
@@ -253,8 +267,8 @@ Section "ScummVM" SecMain
 !endif
 
 	# Main exe and dlls
-	File "${build_dir}\scummvm.exe"
-	File "${build_dir}\SDL.dll"
+	File "${staging_dir}\scummvm.exe"
+	File "${staging_dir}\SDL.dll"
 
 	WriteRegStr HKCU "${REGKEY}" InstallPath "$INSTDIR"    ; Store installation folder
 SectionEnd
@@ -354,3 +368,61 @@ Function un.onInit
 	ReadRegStr   $INSTDIR HKCU "${REGKEY}" InstallPath
 	!insertmacro MUI_STARTMENU_GETFOLDER Application $StartMenuGroup
 FunctionEnd
+
+
+#########################################################################################
+# Helper functions
+#########################################################################################
+
+;-------------------------------------------------------------------------------
+; strips all CRs and then converts all LFs into CRLFs
+; (this is roughly equivalent to "cat file | dos2unix | unix2dos")
+;
+; Usage:
+;	Push "infile"
+;	Call unix2dos
+;
+; Note: this function destroys $0 $1 $2
+Function unix2dos
+	ClearErrors
+
+	Pop $2
+	Rename $2 $2.U2D
+	FileOpen $1 $2 w
+
+	FileOpen $0 $2.U2D r
+
+	Push $2 ; save name for deleting
+
+	IfErrors unix2dos_done
+
+	; $0 = file input (opened for reading)
+	; $1 = file output (opened for writing)
+
+unix2dos_loop:
+	; read a byte (stored in $2)
+	FileReadByte $0 $2
+	IfErrors unix2dos_done ; EOL
+	; skip CR
+	StrCmp $2 13 unix2dos_loop
+	; if LF write an extra CR
+	StrCmp $2 10 unix2dos_cr unix2dos_write
+
+unix2dos_cr:
+	FileWriteByte $1 13
+
+unix2dos_write:
+	; write byte
+	FileWriteByte $1 $2
+	; read next byte
+	Goto unix2dos_loop
+
+unix2dos_done:
+	; close files
+	FileClose $0
+	FileClose $1
+
+	; delete original
+	Pop $0
+	Delete $0.U2D
+FunctionEnd
diff --git a/ports.mk b/ports.mk
index 8e7ac2376b..3481b1274a 100644
--- a/ports.mk
+++ b/ports.mk
@@ -189,7 +189,7 @@ win32setup: $(EXECUTABLE)
 	mkdir -p $(srcdir)/$(STAGINGPATH)
 	$(STRIP) $(EXECUTABLE) -o $(srcdir)/$(STAGINGPATH)/$(EXECUTABLE)
 	cp /usr/local/bin/SDL.dll $(srcdir)/$(STAGINGPATH)
-	makensis -V2 -Dtop_srcdir="../.." -Dstaging_dir="../../$(STAGINGPATH)" $(srcdir)/dists/win32/scummvm.nsi
+	makensis -V2 -Dtop_srcdir="../.." -Dstaging_dir="../../$(STAGINGPATH)" -Darch=$(ARCH) $(srcdir)/dists/win32/scummvm.nsi
 
 #
 # AmigaOS specific
-- 
cgit v1.2.3


From 00e3f920d01be56b5882f721a3eaf40ea6210f44 Mon Sep 17 00:00:00 2001
From: Littleboy
Date: Fri, 1 Jul 2011 01:16:35 -0400
Subject: CREATE_PROJECT: Update with new location of NSIS script and updated
 parameters

---
 devtools/create_project/scripts/installer.vbs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/devtools/create_project/scripts/installer.vbs b/devtools/create_project/scripts/installer.vbs
index d752355acd..19b4eee49b 100644
--- a/devtools/create_project/scripts/installer.vbs
+++ b/devtools/create_project/scripts/installer.vbs
@@ -72,10 +72,9 @@ Sub CreateInstaller()
 	' Build command line
 	Dim commandLine : commandLine = """" & nsisPath & "\makensis.exe"" /V2" & _
 	                                " /Dtop_srcdir=""" & rootFolder & """" & _
-	                                " /Dbuild_dir=""" & targetFolder & """" & _
-	                                " /Dtext_dir=""" & rootFolder & """" & _
+	                                " /Dstaging_dir=""" & targetFolder & """" & _
 	                                " /DARCH=""" & arch & """" & _
-	                                " """ & rootFolder & "\dists\nsis\scummvm.nsi"""
+	                                " """ & rootFolder & "\dists\win32\scummvm.nsi"""
 
 	Dim oExec: Set oExec = WshShell.Exec(commandline)
 	If Err.Number <> 0 Then
-- 
cgit v1.2.3