[Scummvm-cvs-logs] scummvm master -> 0be5ba9b0e914d3855f22ea24ac291a157ff86b6

[Kirben]

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

Summary:
50f28f2c23 BUILD: Use separate win32 target for each installer.
0be5ba9b0e Merge branch 'master' of github.com:scummvm/scummvm


Commit: 50f28f2c23d72799bf4e415783650320a432ed97
    https://github.com/scummvm/scummvm/commit/50f28f2c23d72799bf4e415783650320a432ed97
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-06-29T09:14:36-07:00

Commit Message:
BUILD: Use separate win32 target for each installer.

Changed paths:
    configure
    ports.mk



diff --git a/configure b/configure
index 0443a2f..a418091 100755
--- a/configure
+++ b/configure
@@ -174,7 +174,8 @@ _strip=strip
 _ar="ar cru"
 _as="as"
 _windres=windres
-_win32path="build/x86"
+_win32build="build/x86"
+_win32path="c:/scummvm"
 _aos4path="Games:ScummVM"
 _staticlibpath=/sw
 _sdlconfig=sdl-config
@@ -3517,6 +3518,7 @@ AS := $_as
 ASFLAGS := $ASFLAGS
 WINDRES := $_windres
 WINDRESFLAGS := $WINDRESFLAGS
+WIN32BUILD=$_win32build
 WIN32PATH=$_win32path
 AOS4PATH=$_aos4path
 STATICLIBPATH=$_staticlibpath
diff --git a/ports.mk b/ports.mk
index 4535735..62f76bd 100644
--- a/ports.mk
+++ b/ports.mk
@@ -162,39 +162,44 @@ osxsnap: bundle
 scummvmwinres.o: $(srcdir)/icons/scummvm.ico $(DIST_FILES_THEMES) $(DIST_FILES_ENGINEDATA) $(srcdir)/dists/scummvm.rc
 	$(QUIET_WINDRES)$(WINDRES) -DHAVE_CONFIG_H $(WINDRESFLAGS) $(DEFINES) -I. -I$(srcdir) $(srcdir)/dists/scummvm.rc scummvmwinres.o
 
-# Special target to prepare data files for distribution / installer creation
-win32data: $(EXECUTABLE)
-	mkdir -p $(srcdir)/$(WIN32PATH)
-	cp $(srcdir)/AUTHORS          $(srcdir)/$(WIN32PATH)
-	cp $(srcdir)/COPYING          $(srcdir)/$(WIN32PATH)
-	cp $(srcdir)/COPYING.LGPL     $(srcdir)/$(WIN32PATH)
-	cp $(srcdir)/COPYRIGHT        $(srcdir)/$(WIN32PATH)
-	cp $(srcdir)/NEWS             $(srcdir)/$(WIN32PATH)
-	cp $(srcdir)/README           $(srcdir)/$(WIN32PATH)
-	cp /usr/local/README-SDL.txt  $(srcdir)/$(WIN32PATH)/README-SDL
-	unix2dos $(srcdir)/$(WIN32PATH)/*.*
-	$(STRIP) $(EXECUTABLE) -o $(srcdir)/$(WIN32PATH)/$(EXECUTABLE)
-	cp $(DIST_FILES_THEMES) $(srcdir)/$(WIN32PATH)
-ifdef DIST_FILES_ENGINEDATA
-	cp $(DIST_FILES_ENGINEDATA) $(srcdir)/$(WIN32PATH)
-endif
-	cp /usr/local/bin/SDL.dll $(srcdir)/$(WIN32PATH)
-
 # Special target to create a win32 snapshot binary (for Inno Setup)
-win32dist: win32data
-	cp $(srcdir)/icons/scummvm.ico       $(srcdir)/$(WIN32PATH)
-	cp $(srcdir)/dists/win32/ScummVM.iss $(srcdir)/$(WIN32PATH)
-	mv $(WIN32PATH)/AUTHORS              $(srcdir)/$(WIN32PATH)/AUTHORS.txt
-	mv $(WIN32PATH)/COPYING              $(srcdir)/$(WIN32PATH)/COPYING.txt
-	mv $(WIN32PATH)/COPYING.LGPL         $(srcdir)/$(WIN32PATH)/COPYING.LGPL.txt
-	mv $(WIN32PATH)/COPYRIGHT            $(srcdir)/$(WIN32PATH)/COPYRIGHT.txt
-	mv $(WIN32PATH)/NEWS                 $(srcdir)/$(WIN32PATH)/NEWS.txt
-	mv $(WIN32PATH)/README               $(srcdir)/$(WIN32PATH)/README.txt
-	mv $(WIN32PATH)/README-SDL           $(srcdir)/$(WIN32PATH)/README-SDL.txt
+win32dist: $(EXECUTABLE)
+	mkdir -p $(WIN32PATH)
+	$(STRIP) $(EXECUTABLE) -o $(WIN32PATH)/$(EXECUTABLE)
+	cp $(DIST_FILES_THEMES) $(WIN32PATH)
+ifdef DIST_FILES_ENGINEDATA
+	cp $(DIST_FILES_ENGINEDATA) $(WIN32PATH)
+endif
+	cp $(srcdir)/AUTHORS $(WIN32PATH)/AUTHORS.txt
+	cp $(srcdir)/COPYING $(WIN32PATH)/COPYING.txt
+	cp $(srcdir)/COPYING.LGPL $(WIN32PATH)/COPYING.LGPL.txt
+	cp $(srcdir)/COPYRIGHT $(WIN32PATH)/COPYRIGHT.txt
+	cp $(srcdir)/NEWS $(WIN32PATH)/NEWS.txt
+	cp $(srcdir)/README $(WIN32PATH)/README.txt
+	cp /usr/local/README-SDL.txt $(WIN32PATH)
+	cp /usr/local/bin/SDL.dll $(WIN32PATH)
+	cp $(srcdir)/icons/scummvm.ico $(WIN32PATH)
+	cp $(srcdir)/dists/win32/ScummVM.iss $(WIN32PATH)
+	unix2dos $(WIN32PATH)/*.txt
 
 # Special target to create a win32 NSIS installer
-win32setup: win32data
-	makensis -V2 -Dtop_srcdir="../.." -Dtext_dir="../../$(WIN32PATH)" -Dbuild_dir="../../$(WIN32PATH)" $(srcdir)/dists/nsis/scummvm.nsi
+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/nsis/scummvm.nsi
 
 #
 # AmigaOS specific


Commit: 0be5ba9b0e914d3855f22ea24ac291a157ff86b6
    https://github.com/scummvm/scummvm/commit/0be5ba9b0e914d3855f22ea24ac291a157ff86b6
Author: Travis Howell (kirben at optusnet.com.au)
Date: 2011-06-29T09:15:23-07:00

Commit Message:
Merge branch 'master' of github.com:scummvm/scummvm

Changed paths:
  A icons/count.ico
    backends/taskbar/win32/win32-taskbar.cpp
    backends/taskbar/win32/win32-taskbar.h
    configure
    dists/scummvm.rc
    engines/lastexpress/data/snd.cpp
    engines/lastexpress/data/snd.h
    engines/lastexpress/shared.h
    engines/lastexpress/sound/entry.cpp
    engines/lastexpress/sound/entry.h
    engines/lastexpress/sound/queue.cpp
    engines/lastexpress/sound/queue.h
    engines/lastexpress/sound/sound.cpp